| commit | 5a689007668fbba43d34eea7cfa3c8cd2c2e21de | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Sat Aug 22 00:25:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 22 00:25:11 2015 +0000 |
| tree | 389271f8aa4ed390f68b549989f0b771f6eebde6 | |
| parent | ed8cf61b841d40bdabd60f633b2c3ef036cb8f3a [diff] | |
| parent | f7b12e7ae8f481f3fab27d1a17bded4b4f2ce423 [diff] |
am f7b12e7a: Merge "Move annotations to native." * commit 'f7b12e7ae8f481f3fab27d1a17bded4b4f2ce423': Move annotations to native.