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