OSDN Git Service

resolve merge conflicts of 28ce9cd to lmp-dev
authorEino-Ville Talvala <etalvala@google.com>
Wed, 17 Aug 2016 23:06:15 +0000 (23:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:06:15 +0000 (23:06 +0000)
commit009bc279a2111197a3aeb33367ce005ba43d7f36
tree791ada75e6a9f49e018b4dc137df53115d42a6e9
parent6c1911e48bcde6ef8b20b6419bbf8dc53a4f8056
parent53d55d78340bbbf0f2372042e0ee08eff7dee10d
resolve merge conflicts of 28ce9cd to lmp-dev
am: 53d55d7834

Change-Id: If95d67bf8169f121f824639c7324f5470169e59e