OSDN Git Service

resolve merge conflicts of 2c53526 to lmp-mr1-dev
authorfionaxu <fionaxu@google.com>
Wed, 8 Jun 2016 16:58:13 +0000 (16:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 16:58:13 +0000 (16:58 +0000)
commit1e8fe12f4e6e3cdade70fccd9cfa7d29a6c120b0
tree0511fb6864729644f9540eb33a8f0dced43ab807
parent75095e6f02b13d070bb74b019ab6392f0f7b1105
parentc196526f8e33b745b8d515df46b003ef44114135
resolve merge conflicts of 2c53526 to lmp-mr1-dev
am: c196526f8e

Change-Id: Ic0f9fb749282b46d5c41fd36aaab42090ecbd0b9