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:43:34 +0000 (23:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:43:34 +0000 (23:43 +0000)
commit6c26438b346731a0bc01fce6754b1177f671f676
treef36611e5e5b06a9366016b4166e8e994f75056f3
parenta8ff345be54712ed1b1bdf6d2dc135eac7bf5ebb
parentfc2cdc605bfb143eb8258439a02924233a2e90ac
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5 am: 000c33c8eb am: 220505e6fe
am: fc2cdc605b

Change-Id: I497fca7878c00aab9363f1d09f74375f5cac9ac4