| commit | 3b3b378d93bf57db79f0f3b77f79ee201719e9d2 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Thu Oct 23 23:02:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 23:02:56 2014 +0000 |
| tree | f0e42edca82ea040e9ae48503faaa8c5a5541bfe | |
| parent | c89b2ade48144901baf8b1d268a4adc1a02dab53 [diff] | |
| parent | ef20147e2ba03c1532301f31027705f4a08e6b87 [diff] |
am ef20147e: Merge branch \'lmp-mr1-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev * commit 'ef20147e2ba03c1532301f31027705f4a08e6b87': Remove SystemApi annotations.