| commit | 576be94bd11628251ed90650d0834671cef7f6c8 | [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 | 0fbacad14dee12248e86bb21e27db7000bc4bec9 [diff] | |
| parent | 0baead15fe8e9eda268d7853e9990850445c40a6 [diff] |
Merge "resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp am: 0baead15fe Change-Id: I17dd67f1337027c2783588ee5785c8a7bd3fa7a0