| commit | 276d9afb7a968431c8da899612d3edd81b12091b | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Sat Aug 22 00:32:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 22 00:32:16 2015 +0000 |
| tree | 42771f1928d1dbe2d05c6719e115ed5377e2b5fb | |
| parent | 0cd58b6542ebb114c3ed91673a0673b7d1188209 [diff] | |
| parent | f6b97c9ac69a064e8924d96ea42d44b3810cb870 [diff] |
am f6b97c9a: Merge "Move annotations to native." * commit 'f6b97c9ac69a064e8924d96ea42d44b3810cb870': Move annotations to native.