| commit | c16d1448bb139384cc86d14d9412ffe1a62817c8 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Dec 04 15:16:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 15:16:37 2014 +0000 |
| tree | 6257a15f70890548b52bdd570e5b40fe0afc109b | |
| parent | 92a4627250d74264719eff3ade798a9f4480ed5a [diff] | |
| parent | b2ded18a84b3b23a76b462644dcd24b3c33f5234 [diff] |
am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev * commit 'b2ded18a84b3b23a76b462644dcd24b3c33f5234': Fix typos in previous bugfixes.