OSDN Git Service

resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
authorDavid Christie <dnchrist@google.com>
Wed, 24 Aug 2016 22:23:42 +0000 (22:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 22:23:42 +0000 (22:23 +0000)
commit362668b6f711ba481290abd767b4eaa47c034f4d
tree9554c3bb5001de98749498287f16b934695ed152
parent3275a3a5a54b6e3148db23609d1b3d35e9277bc0
parente24eb2dbb5e54b410d30bfcd8efb21029cc0b2d4
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
am: e24eb2dbb5

Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10