| commit | f7abe1bf9b48c9e1c31b8ca01d65e10624b089e0 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Tue May 30 23:28:55 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 30 23:29:03 2017 +0000 |
| tree | bd901b20ecbd5dd1545e6eeecef3b5c87b8a22ed | |
| parent | d463c15584d134a8c4fce97d82667049cfe615bb [diff] | |
| parent | 832267afca9f3cf7ed1682e6a33fbd96f4879d12 [diff] |
Merge "resolve merge conflicts of fc5c78e0ef79 to oc-dev-plus-aosp" into oc-dev-plus-aosp