| commit | 04b63e5ab23092cb8cbbfc482ef0ece8e457cb2a | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Mon Aug 14 16:31:07 2017 -0700 |
| committer | sqian <shuoq@google.com> | Mon Aug 14 16:31:59 2017 -0700 |
| tree | 1c984b3c67421c4c7c99096bca6d52c6cfce76fe | |
| parent | a0eff56a4cfa73d5cac6da68e54291420db165bc [diff] | |
| parent | 3ceaacc431c419559508d6f991db5aadf5894732 [diff] |
resolve merge conflicts of 3ceaacc to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic688982b8d16a7d42cafdf0d76eb6ec931322b1e