| commit | cd6646419b8214eb5d590d599eabc4a0dc4e4fd3 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Sat Aug 22 00:36:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 22 00:36:15 2015 +0000 |
| tree | 42b9be9b2cc7a583ec839b2ae18d871d7b9a199c | |
| parent | 2219699305cb7027e21472bede07d2db033d535c [diff] | |
| parent | 5a689007668fbba43d34eea7cfa3c8cd2c2e21de [diff] |
am 5a689007: am f7b12e7a: Merge "Move annotations to native." * commit '5a689007668fbba43d34eea7cfa3c8cd2c2e21de': Move annotations to native.