commit | b9d82050ce6aa198b8b48125cfdc712f681af7f8 | [log] [tgz] |
---|---|---|
author | Roland Levillain <rpl@google.com> | Tue Aug 25 12:20:18 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 12:20:18 2015 +0000 |
tree | 23895470771eeb96f8780b3883caf4e4a51e958a | |
parent | f079861c0477399a2f94a2a52afee40f70d0b8f8 [diff] | |
parent | fe8e04554ad3712a0a2b1a2e0d0e4a9fef469c25 [diff] |
am fe8e0455: am c9774838: Merge "Revert "Move annotations to native."" * commit 'fe8e04554ad3712a0a2b1a2e0d0e4a9fef469c25': Revert "Move annotations to native."