| commit | dfc724eb343474321bb039c6b2bccd52766e1c99 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Mar 27 01:50:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 01:50:29 2015 +0000 |
| tree | 906bd5d91c6725b9bbdc39b90a35425d09f45796 | |
| parent | b51ba53ed55d8cc7e6229a336eb32d29036aa576 [diff] | |
| parent | 1bf6d5432f90d210e8cd01a820e83950b5de076e [diff] |
am 1bf6d543: (-s ours) am 5935ee2f: am 836f5d98: am 85afc992: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev * commit '1bf6d5432f90d210e8cd01a820e83950b5de076e':