| commit | cfaa60ef59aa5849fa8e20b6d951a28d61b9ac8f | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri May 06 18:36:59 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 06 18:37:00 2016 +0000 |
| tree | a727d2f144d74a78c4fd7b1723e537a4786c02cc | |
| parent | 1e2234420db7b853dd3b48328ee54d24fd4884dd [diff] | |
| parent | fca540f81dd9fdb37ca7086cbd4527da9e14563a [diff] |
Merge "resolve merge conflicts of 8d89f40 to nyc-mr1-dev am: f8b50aa70b" into nyc-mr1-dev-plus-aosp