OSDN Git Service

resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
authorEino-Ville Talvala <etalvala@google.com>
Wed, 17 Aug 2016 23:28:47 +0000 (23:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:28:47 +0000 (23:28 +0000)
commitbf7bc974e5be47579bc9b173af3f4b17a11095fd
tree04438e0cdd8a7de5a87db7959bb74d028e1e4930
parent0efacfef740a1bfc4a6038deef120c279ab0d8c8
parentac2655b5cb06c63b56a676e4cf506addcbca31f6
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063
am: ac2655b5cb

Change-Id: I51396e87a67e735379249335e0c229f892db6412