OSDN Git Service

Merge changes I72e979ce,I183b8a48
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 12 Mar 2019 16:25:25 +0000 (16:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Mar 2019 16:25:25 +0000 (16:25 +0000)
commitfbdd7930a01697ba8a60d6762162615fd64c16ed
tree57260b01287a611c60ab38f3a5d7836fa810f9b0
parent794d22d0a7a02ada66e526bd56eac1170977eedb
parenta4b70300e41bb432882e513c3a699012bebaeaa3
Merge changes I72e979ce,I183b8a48

* changes:
  Add @IntDef for status of committed rollback.
  Use test stubs for RollbackTests, not system stubs.
api/system-current.txt
core/java/android/content/pm/PackageInstaller.java
core/java/android/content/rollback/PackageRollbackInfo.java
core/res/AndroidManifest.xml