| commit | 472da83b71a87ae65d8c5cbe6136dde898515b40 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Wed Nov 02 17:51:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 02 17:51:51 2016 +0000 |
| tree | ea4355e784e691411a0bfcd2c3789e29b0c2fc70 | |
| parent | 299978132b8482beca745cc6f4c61f2e27fef825 [diff] | |
| parent | baa73944e43d657af99d8d45776f5a8d1d0bfea2 [diff] |
resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp am: c5eacceb3f am: baa73944e4 Change-Id: I6d636ee7464a9dea03f2ad2f9474d23627c0b6f3