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)
commit5a56efd888b39894bc3e0bb8990dc55e1de747b5
treeaccecb27f9a8dfac34ca9ec09021ad4c8af8dda4
parentc84e8f39d030cb717342d7da0782dd4d2137e893
parent1238ffcd2ce7d8b7a792b9bd1d58562ad7d4bfd6
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5
am: 1238ffcd2c

Change-Id: I7f4d19c3c406157693aef46b695f0790b74d0cee