OSDN Git Service

resolve merge conflicts of a260b85 to stage-aosp-master
authorErik Kline <ek@google.com>
Wed, 26 Jul 2017 23:42:51 +0000 (08:42 +0900)
committerErik Kline <ek@google.com>
Wed, 26 Jul 2017 23:42:51 +0000 (08:42 +0900)
commit313b0d3cb45e446718eda6cea224e67b1f8059e2
treec9f40f831bb11dbb51b974b5f7fa1a72e07bc396
parent1365bba6769d8272ceb0f485dfa547936a5b7305
parenta260b85f114e181fccbca48ef9270cc4d95d0d56
resolve merge conflicts of a260b85 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: If934df91847c0eedf318d8b265cb33428bb33c49
Android.bp