| commit | 4c5b5cffa7412a66cb56fe7b78daa7c0ee3d689a | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Wed Jan 07 09:14:16 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 07 09:14:17 2015 +0000 |
| tree | c6da6218fec8ac9e0f971bd8c36e83150e7a43c4 | |
| parent | 71d8b8ce99296fdc9e4420e4d43daa6e65c65c61 [diff] | |
| parent | 188a8774c95133849e26c53ad551e347c71c4b8c [diff] |
Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev