| commit | fe8e04554ad3712a0a2b1a2e0d0e4a9fef469c25 | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Tue Aug 25 12:13:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 12:13:04 2015 +0000 |
| tree | 32b50f85ae66aaffd67fa5d0ed2f91d91369bb96 | |
| parent | fc509f70a21cbe1bab82359cc57aca6b9bff4938 [diff] | |
| parent | c97748381468485535b11bfc8664c26385f4b715 [diff] |
am c9774838: Merge "Revert "Move annotations to native."" * commit 'c97748381468485535b11bfc8664c26385f4b715': Revert "Move annotations to native."