OSDN Git Service

resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp
authorLorenzo Colitti <lorenzo@google.com>
Fri, 14 Apr 2017 17:02:27 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 17:02:27 +0000 (17:02 +0000)
commit405fd19da1d2f0e2a5edb08bc6a31db02adc1f25
treef615c4868468e19dbaf1ec2da68c54422b90147a
parentb595d2a08cfc1c80df9a3f99d518d20810c8ec97
parentd6af00f5e4747b58794abb94a5b0c210c8c98795
resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp
am: d6af00f5e4  -s ours

Change-Id: If109b819ad9cfa71890e6a377a6d2b08d35ead87