| commit | c1c9579764dfb292880a631062ddd9fc46130f4d | [log] [tgz] |
|---|---|---|
| author | Pankaj Kanwar <pkanwar@google.com> | Thu Apr 27 21:14:07 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 27 21:14:11 2017 +0000 |
| tree | 64ad2ca95776a215c03cd9adce06f0a1d8beffaf | |
| parent | 73bdb10bc8b5179757e22eb96fbd031c68f2bde5 [diff] | |
| parent | 1eedb9c214cdcab61aa4b2decb61d4fd85a5ff61 [diff] |
Merge "resolve merge conflicts of 8814befacdf5 to oc-dev-plus-aosp" into oc-dev-plus-aosp