| commit | 3591cb48f5489dbce6db82886b870e884974a274 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Fri Jan 20 02:19:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 02:19:36 2017 +0000 |
| tree | fe5e271c356a3a6eea24e86bbecd620d87b032e7 | |
| parent | 051dfa7ec373c2f2c8ea16caa10a36401998002e [diff] | |
| parent | 4eb997d52b05a005f82f4fee5f55fd3bec1bb2a9 [diff] |
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours Change-Id: If5c4537e910fffddd757be2a80ca9c949e93ed93