| commit | 68800e1d76368a5c9cec9931a1cc08bf985f948b | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Fri Oct 31 00:24:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 00:24:34 2014 +0000 |
| tree | 5a3f3be822bb4bf168cfd964b1430737e1b60ea1 | |
| parent | 090bce830f5deca6fba8df45a0e749b5cb9b6e8b [diff] | |
| parent | 90f430c9524755f50f124ea741fa29e93dcb9fc0 [diff] |
am 90f430c9: am 0ebad463: am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev * commit '90f430c9524755f50f124ea741fa29e93dcb9fc0':