| commit | e38db4c528de2cd59370f6e6980ac4ba0d8221ab | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Wed Oct 29 18:49:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 18:49:21 2014 +0000 |
| tree | a5896b95357155093fd1252be2927da6a6dd0316 | |
| parent | 455a4c3f915bce079ca2aceb4fc30b2f6c44dd14 [diff] | |
| parent | 5350100bbdfd1e4aa84c818f728f2d5193a7094f [diff] |
am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev * commit '5350100bbdfd1e4aa84c818f728f2d5193a7094f':