| commit | 8578b68ac2c0105295356b8bfce5b78ca72c1942 | [log] [tgz] |
|---|---|---|
| author | Hsin-Yi Chen <hsinyichen@google.com> | Mon Aug 21 01:48:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 21 01:48:24 2017 +0000 |
| tree | 6ed0fb30c5ccbe65447f9769d563aa89cecb54e6 | |
| parent | 6f6b9fec679d0f25caecce805bf8242983954d90 [diff] | |
| parent | 812dfcd2690dbf20af6ef85bfa280ce501075982 [diff] |
resolve merge conflicts of 6c8cab115 to stage-aosp-master am: 71f6de410f am: 812dfcd269 Change-Id: Ice863ef7745fcfcbd06affd501d79325d3f6c52f