| commit | 22ca4f76c2606862483c891fd82f80183405d064 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed Jun 28 14:28:26 2017 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Wed Jun 28 05:55:43 2017 +0000 |
| tree | 61529c596d6dad8cd3eafd056adb2de3c4400ea2 | |
| parent | aa447d7aa5d15af50bec83bd903827dae78e54b6 [diff] | |
| parent | 20d9cf2ee7e82bb397baf95f535b15e8afa8df0a [diff] |
resolve merge conflicts of 20d9cf2ee to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Merged-In: If8fc73e4ae4c2f8281c41a12f1c18079aab8baa2 Change-Id: Ie7feb839c9da2a11579ed850680c044c9fc3432a