| commit | 469436f3823e944239717a0c92efdb0e75f3e643 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Tue Aug 25 22:23:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 22:23:46 2015 +0000 |
| tree | 42771f1928d1dbe2d05c6719e115ed5377e2b5fb | |
| parent | f7a74254e0c61a097a44c2b00b8e4fde274096fd [diff] | |
| parent | 2898abc18021b942fcd8b8ffdb20af8cd8bbf8a5 [diff] |
am 2898abc1: Merge "Revert "Revert "Move annotations to native.""" * commit '2898abc18021b942fcd8b8ffdb20af8cd8bbf8a5': Revert "Revert "Move annotations to native.""