| commit | 576a8f72f8d9f3bcef25ba2e3236b1c926f61f21 | [log] [tgz] |
|---|---|---|
| author | Nick Vaccaro <nvaccaro@google.com> | Tue Oct 25 00:16:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 25 00:16:02 2016 +0000 |
| tree | c64aefe3166a98ef22fb5d12f50dd835c966a4b6 | |
| parent | e37e3b8d11f789a1ae09e046d0a8b33c4e244629 [diff] | |
| parent | 8649ccda290c6917a1f52e14e147f9245cb6f792 [diff] |
Merge "resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp am: 0baead15fe Change-Id: I17dd67f1337027c2783588ee5785c8a7bd3fa7a0