| commit | 3c75ecd8115c02a34413b7990e0fea0dcbbb08b3 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Thu Jan 08 13:51:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 08 13:51:57 2015 +0000 |
| tree | 04b53f8af12c48714104d3d013c5dcb4ddaa46e2 | |
| parent | 3c5453aa09cf13e64750da6c0f0a499e0497002e [diff] | |
| parent | c0221e7e7ef8e572d7e3ce4a1b66195b4f938f5b [diff] |
am c0221e7e: Merge "Allow to disable forced keep of annotated" * commit 'c0221e7e7ef8e572d7e3ce4a1b66195b4f938f5b': Allow to disable forced keep of annotated