tree 9554c3bb5001de98749498287f16b934695ed152
parent 3275a3a5a54b6e3148db23609d1b3d35e9277bc0
parent e24eb2dbb5e54b410d30bfcd8efb21029cc0b2d4
author David Christie <dnchrist@google.com> 1472077422 +0000
committer android-build-merger <android-build-merger@google.com> 1472077422 +0000

resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
am: e24eb2dbb5

Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10