| commit | 7ce2f280b7eec7b955bd2eaa71a71f0dc0339310 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Aug 09 21:07:43 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 09 21:07:44 2016 +0000 |
| tree | e2a57deca0aee9340b6ddc3edcfd9499ae7d1448 | |
| parent | a1d8d3815d3c9966f0f907c24e152ab38bb60265 [diff] | |
| parent | 2dad9c33e9ec1f5e1f2885e234ffd6569e7ba155 [diff] |
Merge "DO NOT MERGE ServiceManager: Restore basic uid check am: f03ba2c0d8 am: a9963dcfb7 am: cac59eae3b am: 0c63d9490c -s ours am: cc453b9926 am: d0081e169c" into nyc-mr1-dev-plus-aosp