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:22:50 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:22:50 +0000 (23:22 +0000)
commit3197a71063dfd2b55342da14bb8943667e33e4ab
tree04438e0cdd8a7de5a87db7959bb74d028e1e4930
parent29afa93f4f630223aec65fc1403621c4c0576ee8
parente0cb79f1bc4312fc5f25e34777c48ca7f4b5a64f
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e
am: e0cb79f1bc

Change-Id: Ia82eb5aad072dc424a010b384019140ff05e792e