| commit | d1a3d9ef35a786bc66caaa8f8bb9674cef2432dc | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Fri Apr 03 14:52:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 03 14:52:37 2015 +0000 |
| tree | c825d21400bcca31d52e62c6a9f1d68de6a6ce50 | |
| parent | 0c94f1468db45d1e791fa3a9d2558fd578b94b30 [diff] | |
| parent | 14d81e140687fb6302ece09649ed07adb14d9b09 [diff] |
am 14d81e14: am 45e4d877: Allow to disable forced keep of annotated * commit '14d81e140687fb6302ece09649ed07adb14d9b09': Allow to disable forced keep of annotated