commit | 0a627e5a5f97ace5d76a2892ae5ef450855d147c | [log] [tgz] |
---|---|---|
author | Tianjie Xu <xunchang@google.com> | Fri Jan 20 03:23:12 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 03:23:12 2017 +0000 |
tree | 86589e433fe58da7ba2423ae55d9747bf120f140 | |
parent | 8a513340620878a848fbe122352c729ef626db13 [diff] | |
parent | 9930b28456110c853f9be16114fe1e1f3048f490 [diff] |
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 Change-Id: Ib4853ac0b4f56534130a6b40fbe4ea1a95131cca