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:18:48 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:18:48 +0000 (23:18 +0000)
commite0cb79f1bc4312fc5f25e34777c48ca7f4b5a64f
tree2bbb2e296cffcdfceac5c90322c0541071a932d5
parente961e9eb2aa4cb382448b4a8bb208805469eb315
parentab159ee14e4944c53a806b45b58416f2389a9c7c
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99
am: ab159ee14e

Change-Id: I34352f989484eeac66e4a87f51a2408b4fbf10b3