| commit | 5ada51ac58ed84e28f0d7768a9aaef4f27a74f9a | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Mon Jul 25 06:35:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 25 06:35:50 2016 +0000 |
| tree | 6f6f7edca2d507d05bd1b48be4a69594be8c33ce | |
| parent | 6ba76801dafbf3db9d4be52e416d4879d46a66c1 [diff] | |
| parent | 5d795e95b72a7c76624000de378bcb343c12c4c9 [diff] |
resolve merge conflicts of 528378d to nyc-mr1-dev-plus-aosp am: 5d795e95b7 Change-Id: I2251e2839f3b6d623310a3a64f88396f3d2569ab