| commit | da99944e4763e4deb1130bbd36ede7855fbb46ff | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu May 12 02:56:16 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 12 02:56:16 2016 +0000 |
| tree | cfd3ef6a34845a9e404d59a84507e4c2b064b6a1 | |
| parent | 6387be12ce6f9e40f3a1a9debea8c13d83c265e4 [diff] | |
| parent | 0a0696014cf3f20443eed0a9d74437e427eeb425 [diff] |
Merge "resolve merge conflicts of b97dd87 to nyc-dev-plus-aosp am: c342196249" into nyc-mr1-dev-plus-aosp