| commit | 969f4395cfb08b3b57b6953fa482977b88f3c38c | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Oct 25 05:42:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 25 05:42:05 2016 +0000 |
| tree | f3b56f786d2a3531e4c729ed3045235a0f615174 | |
| parent | 30b37fa7ef8fdbe6d36de3235962bcb8927913a5 [diff] | |
| parent | 836a4045256b61c0025c3ee3b5d9f66c9f67546e [diff] |
resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp am: 836a404525 Change-Id: I56ca4033b9359c9626a1e8d963e57036d21e2cfb