| commit | 9b75c2eef0d7ef06a578b53a96cb8dba661f29e5 | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Tue Jun 14 23:30:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 23:30:19 2016 +0000 |
| tree | 508d46f957bbdd03ecf8293345f29028166fc60d | |
| parent | 50ce65d97eaf52547f31bce46fbd3437153d497c [diff] | |
| parent | 74e86ea582757e7c954a32c8851904c4c366767a [diff] |
resolve merge conflicts of a742d10 to nyc-dev-plus-aosp am: 589994504a am: 6ef3e51b62 Change-Id: Ib6b3e9864d504d22316dd4edbf7500127d1dccf2