| commit | 6c8175fcc47f756274da39a06e23a3126fa8acef | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Dec 04 21:56:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 21:56:07 2014 +0000 |
| tree | 109126729fad8abfcef7f834d7d7ebb221483a9e | |
| parent | 0998e0dc4ad26e08c9be3ca61af3f32e7467d416 [diff] | |
| parent | 028df22fd774c8a545dedb03124587b7a19e047b [diff] |
am 028df22f: am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev * commit '028df22fd774c8a545dedb03124587b7a19e047b': Fix typos in previous bugfixes.