| commit | 4d71a15b87e4b67c035216c06aac75837f94af61 | [log] [tgz] |
|---|---|---|
| author | Omari Stephens <xsdg@android.com> | Thu Aug 27 12:35:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:35:29 2015 +0000 |
| tree | c348c2f897a693f2968ca14ea23e5991da75e502 | |
| parent | 6915b7b2b0676a14e2a21da15909f38da29e905e [diff] | |
| parent | 9577e3e583a53cff3bd808aeae2cca896092c161 [diff] |
am 9577e3e5: am d7a6af33: (-s ours) am 274a19e4: Display annotations and annotation values when they are requested (cherry-picked from commit 6fa3e41df1664e59c13830b012b9be39c2b31cae) * commit '9577e3e583a53cff3bd808aeae2cca896092c161':