| commit | 0ebad4632dea62b8262f8cc807267c9159612438 | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Wed Oct 29 22:53:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 22:53:15 2014 +0000 |
| tree | a5896b95357155093fd1252be2927da6a6dd0316 | |
| parent | 99cf1af3c1589d9e36a07868dc1eb0fed25b4395 [diff] | |
| parent | e38db4c528de2cd59370f6e6980ac4ba0d8221ab [diff] |
am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev * commit 'e38db4c528de2cd59370f6e6980ac4ba0d8221ab':