| commit | 69798ad0a70124bca004429a6ad833d7575e1485 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Apr 21 02:05:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 21 02:05:17 2017 +0000 |
| tree | d4345102856d5cf196fab9d0aec959ad83945855 | |
| parent | 5e0ecc121c7893de01891e3e99dceb076926770e [diff] | |
| parent | 5232d6d927d9d76760bcce5a03171ec574f50ff4 [diff] |
Revert "resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp" am: 5232d6d927 Change-Id: Idfa48f492017e11edc79c110cd99eb12ec527025