| commit | 869ef6db978dab8136c6788d219f375016ad42f4 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Tue Aug 25 22:23:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 22:23:47 2015 +0000 |
| tree | d45e0e74a781ddf2b03eae3b795fb306a5442392 | |
| parent | dd338271855c172cf09b3a0fffb749e77cae35a1 [diff] | |
| parent | fa8114ca7226eb14d3804e2995895bdc3c90db92 [diff] |
am fa8114ca: am b5f7abcd: Merge "Revert "Revert "Move annotations to native.""" * commit 'fa8114ca7226eb14d3804e2995895bdc3c90db92': Revert "Revert "Move annotations to native.""