| commit | 9dd289529d4e4fa04e9aa66d44d6af50d9c6b149 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Tue Jun 06 22:53:00 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 06 22:53:07 2017 +0000 |
| tree | 661fab4fcaa609e030117dc3bbbb74215badbb81 | |
| parent | 6cae189d2667f050a8c2565b9a71b540c6e7dfe9 [diff] | |
| parent | 794bcd27ef0abffd01255dd11991e1bcacc954d7 [diff] |
Merge "resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp