| commit | e89c04bbef7e7d953840c1e654d4bd21bc0bdf6f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jun 07 04:40:41 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 07 04:40:41 2016 +0000 |
| tree | 32331d506d6760faaf240a6b1973b6442c4f9270 | |
| parent | 61f8955e12173be5044391dde7d8711b4d7b98c2 [diff] | |
| parent | 7b2115180e94695007d7e9609cebcd6cc3c7bae7 [diff] |
Merge "resolve merge conflicts of f6d0da2 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp