| commit | 00fe242060a2ec701db3b01428056ddfa839edfe | [log] [tgz] |
|---|---|---|
| author | Nick Vaccaro <nvaccaro@google.com> | Tue Nov 29 21:51:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 29 21:51:11 2016 +0000 |
| tree | 797c9ef48e67d2b85fc0da7047d1350ef3cb70e2 | |
| parent | 32e2657214738834bad9f687fbc06ced0238f2ee [diff] | |
| parent | 89e09e5aeb865765b35d9c8af0615585922cf393 [diff] |
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: b892613793 am: 89e09e5aeb Change-Id: Ia21f2920cdcaf21c4056a7a7f3dbae4b7421cb6d