OSDN Git Service

resolve merge conflicts of d38ce6ce to oc-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Sat, 13 May 2017 01:10:44 +0000 (01:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 13 May 2017 01:10:44 +0000 (01:10 +0000)
commite4d6ac66535b5c8ecf725c2d9677bb198b9a6f30
tree854759e71d35757464ea945a6104e08c69128c44
parent3aa27d50fe1827fe0ecf4ab24dc0067baa6829ad
parentbd2d5da516763b38d06126439e883f309ca6656a
resolve merge conflicts of d38ce6ce to oc-dev-plus-aosp
am: bd2d5da516

Change-Id: I236d539a49f2c8ec49afe7b6c5e58e99bd602982