OSDN Git Service

resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
authorNarayan Kamath <narayan@google.com>
Thu, 25 Aug 2016 23:13:51 +0000 (23:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:13:51 +0000 (23:13 +0000)
commita21569cd76fc010e4eb87f243db7411bc2164ba7
treec37ef4fa3370991550f35e04eb5bb6d25dab03ee
parentdd496ec8b015ca48194e5a656f8006e903013a4d
parent8f4f9e4d5e356158a96383348a42cebf4ba274e6
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
am: 8f4f9e4d5e

Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4