| commit | 50ae5be1dee2ebb5929ceb359237cc998aabe2cd | [log] [tgz] |
|---|---|---|
| author | Nick Vaccaro <nvaccaro@google.com> | Tue Nov 29 19:21:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 29 19:21:03 2016 +0000 |
| tree | 1773b7b49910001565110bda6af3261e1c7ac387 | |
| parent | 7d6b2ed5ca43975ee5aefea732116941a96f551c [diff] | |
| parent | e5f6c292ca409c5d122e239a50c1ada03cabbf6c [diff] |
Merge "resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 75c815251c am: e5f6c292ca Change-Id: Ibfb274a9cd78abdf2ec0d2a47a1a0d75227a3f85