| commit | fa8114ca7226eb14d3804e2995895bdc3c90db92 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Tue Aug 25 21:40:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 21:40:39 2015 +0000 |
| tree | 387724eebfe7cd0f7be368e64b22af3894eea4c7 | |
| parent | fc5ce91d46fdb9169860f5c8c3c57a7359dd343f [diff] | |
| parent | b5f7abcdef9aec80e67b581a9bcc0de39e98fc85 [diff] |
am b5f7abcd: Merge "Revert "Revert "Move annotations to native.""" * commit 'b5f7abcdef9aec80e67b581a9bcc0de39e98fc85': Revert "Revert "Move annotations to native.""