OSDN Git Service

Merge "Follow framework refactoring." into nyc-dev
authorJeff Sharkey <jsharkey@android.com>
Thu, 17 Mar 2016 22:14:09 +0000 (22:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Mar 2016 22:14:09 +0000 (22:14 +0000)
commit2758b99e9d1ea7cec97e7c92ddc668ec5e4b0d84
tree86d935af321dfeaa6ce3a7e7f6203f98a72b70ca
parentfeed83f7a38524aedbbb959e5362ee611ce67500
parent297ce9aaf396ab35f28d6c84ad0b3f040494aaf9
Merge "Follow framework refactoring." into nyc-dev
am: 297ce9a

* commit '297ce9aaf396ab35f28d6c84ad0b3f040494aaf9':
  Follow framework refactoring.
AndroidManifest.xml