| commit | f7a74254e0c61a097a44c2b00b8e4fde274096fd | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Tue Aug 25 12:20:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 12:20:17 2015 +0000 |
| tree | 0899cba4c3fb4ec9e52898ed3b6e110fc5247158 | |
| parent | 14fd204125320968f981c61e53ea92d08baa052d [diff] | |
| parent | 8d1562e9fb1f6f2382f20230b63af074a26187f2 [diff] |
am 8d1562e9: Merge "Revert "Move annotations to native."" * commit '8d1562e9fb1f6f2382f20230b63af074a26187f2': Revert "Move annotations to native."