OSDN Git Service

resolve merge conflicts of 5191225 to mnc-dev
authorNarayan Kamath <narayan@google.com>
Thu, 25 Aug 2016 23:08:25 +0000 (23:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:08:25 +0000 (23:08 +0000)
commit8f4f9e4d5e356158a96383348a42cebf4ba274e6
treeaf858ad3db5ae254435d009153b7a8e98fe9e91b
parent8e168116d056d05bac107cc8cb59acf7d86a9a9a
parent1fbc4b8624bb01db0319af0a97b2385e170d8149
resolve merge conflicts of 5191225 to mnc-dev
am: 1fbc4b8624

Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71