Merge "Removing references to reset prior to aidl removal"
am: 2a859d1999

Change-Id: Ib4b993f77bb55635d3a8c707fad0aa6e54bb2272
tree: da0f101cd5d662f5739345915fc5f9011b7e082b
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.bp
  7. AndroidManifest.xml
  8. OWNERS