OSDN Git Service

resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a2156...
authorNarayan Kamath <narayan@google.com>
Fri, 26 Aug 2016 00:42:28 +0000 (00:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:42:28 +0000 (00:42 +0000)
am: 1238ffcd2c

Change-Id: I7f4d19c3c406157693aef46b695f0790b74d0cee


Trivial merge