| commit | e93187ca6182073d5d96ef7329f99f1aa25940f6 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Sat Mar 21 05:15:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 21 05:15:55 2015 +0000 |
| tree | 8bb81ef2afb6d52461480808bebf1dec5edf7df1 | |
| parent | b57554b086a68bca5eaf3bcc5f93ba52514fb27f [diff] | |
| parent | 8dd5fc0f143058b3c56dbcc300f7c6f566dd5cbc [diff] |
am 8dd5fc0f: am 70c55867: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev * commit '8dd5fc0f143058b3c56dbcc300f7c6f566dd5cbc':