| commit | cbf1e2cc945ca1a5d70b6e8c213c4c7a428b9090 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <[email protected]> | Wed Jun 22 01:30:23 2016 +0000 |
| committer | android-build-merger <[email protected]> | Wed Jun 22 01:30:23 2016 +0000 |
| tree | 4e18e2334fe37d6bb3ee1ec9de320f5dfc429351 | |
| parent | 7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb [diff] | |
| parent | cf51c6cb294f77029418c85d06d49f705d52ad13 [diff] |
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee