tree 7e1ccedcc9c9bab2038cd5e4bf88f2402554756d
parent 67b69c05c6fd69585aa5eadfd1528fde3f5caa12
parent 0a627e5a5f97ace5d76a2892ae5ef450855d147c
author Tianjie Xu <xunchang@google.com> 1484883494 +0000
committer android-build-merger <android-build-merger@google.com> 1484883494 +0000

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
am: 0a627e5a5f  -s ours

Change-Id: I503597404e665b723337ee56a46c719890a547a1