| commit | 701627961161087f9edd42b51ae9d2b8ad06b54c | [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 | 2848f760f5a05450f8ddcd619e2c35c6f9ac5ca3 [diff] | |
| parent | dfce0af5f603f172e265419facb14d517ec2cd62 [diff] |
Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp