OSDN Git Service

resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2
authorEino-Ville Talvala <etalvala@google.com>
Wed, 17 Aug 2016 23:17:01 +0000 (23:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:17:01 +0000 (23:17 +0000)
commitab159ee14e4944c53a806b45b58416f2389a9c7c
treecaf67a45645e496d64350945b01f17b6c57ed723
parent49f0bdca6546ce8f6023bc2d4f795ccb927f6147
parent6f21973d992e63647cb17cecb403a190551eb5ed
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2
am: 6f21973d99

Change-Id: I25bd8261bb5962ce12e5321156837e9ef8be06b2