| commit | ee4ab96b00cd410e0f554a0eb960ab1e26957f8e | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Feb 24 18:01:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 24 18:01:39 2017 +0000 |
| tree | 31022756422e79c37674946caf7bf95a5652f5cb | |
| parent | 484f662ee16121829dddfbf809723d9abc165ae3 [diff] | |
| parent | 82b7b27d158bfd657e4db1a88c4ab0b29fa33c9e [diff] |
resolve merge conflicts of e44f4e439d to nyc-mr2-dev-plus-aosp am: 82b7b27d15 Change-Id: I00115a35f6d686b910e007c600edd1b6074fc1cc