OSDN Git Service

Revert "resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp"
authorSteven Moreland <smoreland@google.com>
Fri, 21 Apr 2017 02:05:17 +0000 (02:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 02:05:17 +0000 (02:05 +0000)
commit69798ad0a70124bca004429a6ad833d7575e1485
treed4345102856d5cf196fab9d0aec959ad83945855
parent5e0ecc121c7893de01891e3e99dceb076926770e
parent5232d6d927d9d76760bcce5a03171ec574f50ff4
Revert "resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp"
am: 5232d6d927

Change-Id: Idfa48f492017e11edc79c110cd99eb12ec527025