OSDN Git Service

resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834
authorEino-Ville Talvala <etalvala@google.com>
Wed, 17 Aug 2016 23:10:19 +0000 (23:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:10:19 +0000 (23:10 +0000)
commit6f21973d992e63647cb17cecb403a190551eb5ed
tree791ada75e6a9f49e018b4dc137df53115d42a6e9
parent40239912e1541ac24137ac67a1770e8422b6617e
parent009bc279a2111197a3aeb33367ce005ba43d7f36
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834
am: 009bc279a2

Change-Id: Ic3b18ebaaee959686e6ed29a1289fbcfb50de8de