| commit | 479c280e58f1c87da6156f63f812dc7dbf318b74 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Fri Jul 08 18:24:26 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 08 18:24:26 2016 +0000 |
| tree | 62dfbcd20400672424cf5b0ee0feee32eab064d5 | |
| parent | 6605b0b23a1a74e5a1b6aed1e32d11ce5654f927 [diff] | |
| parent | 906c5574b353f6e7311d0a8a30c0d648b9d22031 [diff] |
Merge "resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp