resolve merge conflicts of 433645782 to oc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 21:09:48 +0000 (21:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:09:48 +0000 (21:09 +0000)
commit4124606528019ebe94d26eb34b081d1ca11b23b4
treeaad755add28ec91c80292ca2400259fdc25363f0
parent9c27bf2303c9729fee8de01d975efe4fa0ed22b0
parent3a33181ba4c0c944df636e3ea3f905fd45bc065b
resolve merge conflicts of 433645782 to oc-dev-plus-aosp
am: 3a33181ba4

Change-Id: Id339737e93fedf20a36a70d45ad5f11db50f7643