| commit | 1e86c376ea0e6ad6821c1352390c241e7b375e94 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jun 08 19:45:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 19:45:38 2016 +0000 |
| tree | 1512aa47da285980bc2c37a633bbbf12b5e604ba | |
| parent | 2ba211b5caf1d61f2a8d351505e60fcaa44ced6a [diff] | |
| parent | ea92d5d1c0074e2bbede89a1af5a152999b866aa [diff] |
resolve merge conflicts of 781e8c2 to nyc-mr1-dev-plus-aosp am: ea92d5d1c0 Change-Id: I1aabe531b0a2a26828f0ec68de70158b8c11e3fb