| commit | 20352727af3237c600e876162b806ecc2e54bb01 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jun 07 04:40:43 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 07 04:40:43 2016 +0000 |
| tree | ea9edc7539e6d0e7ce9515efa57a73a6e93e63e7 | |
| parent | 8d532e47376859e2ea8f953ebe75d24560e80464 [diff] | |
| parent | 20fd80d0e610b851d98986a351e6ce6fce7cecf2 [diff] |
Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp