OSDN Git Service

Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours...
authorSudheer Shanka <sudheersai@google.com>
Fri, 26 Aug 2016 00:16:36 +0000 (00:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:16:36 +0000 (00:16 +0000)
commit1167bcf2c972cafb10a907f280fa5745ef82c30c
tree0337c00afc90c59498b0ff23c528b207c93269da
parent20e7a6b448427e3679c8d89c192c93ade4fa417a
parent5d146ccdb8c5adad9a80f1d0d8563d18e5629411
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev am: fea9feb30e am: c3a6dbd46e
am: 5d146ccdb8

Change-Id: I5d1d23c9dabb84d0b2b30ff63b387c93c63c6c31