| commit | 3756a8350b9f22c78ab195681c262554a7f6e400 | [log] [tgz] |
|---|---|---|
| author | Craig Donner <cdonner@google.com> | Tue Jun 14 03:55:26 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 14 03:55:27 2016 +0000 |
| tree | 591ab3edd1f559289da355152e901a0cd1f99957 | |
| parent | 41a67e15ddfe461c5ce16f5af32d46f270b65211 [diff] | |
| parent | 7aa838826c48fe0ec3c4a75e709316c87ce9aea5 [diff] |
Merge "resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-dev-plus-aosp