| commit | 90f430c9524755f50f124ea741fa29e93dcb9fc0 | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Fri Oct 31 00:12:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 00:12:36 2014 +0000 |
| tree | 6dd0ebf6e26841d2887e336d78348dff044812cb | |
| parent | 86437bbb6569b6018bf386c7bdeaa70e1c0d81f5 [diff] | |
| parent | 0ebad4632dea62b8262f8cc807267c9159612438 [diff] |
am 0ebad463: am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev * commit '0ebad4632dea62b8262f8cc807267c9159612438':