| commit | 81fb5d1208999debf3a174bf96793dd7be4549b0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 22 16:09:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 22 16:09:55 2016 +0000 |
| tree | 4c9ab17bcadcc2fe31f0cd49b834da42d83c3cea | |
| parent | 9cfe0613fd023d423402d74f6cf5dabd37a0ab0a [diff] | |
| parent | b54a33a25e62b4dbf74299de43ef90fbbb93e4a0 [diff] |
resolve merge conflicts of f5b35b6 to stage-aosp-master am: b59e296147 am: b54a33a25e Change-Id: Ib96604eaa304105b3f1a381c68cb0f6bf3c55778