tree c37ef4fa3370991550f35e04eb5bb6d25dab03ee
parent dd496ec8b015ca48194e5a656f8006e903013a4d
parent 8f4f9e4d5e356158a96383348a42cebf4ba274e6
author Narayan Kamath <narayan@google.com> 1472166831 +0000
committer android-build-merger <android-build-merger@google.com> 1472166831 +0000

resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
am: 8f4f9e4d5e

Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4