| commit | 0214acd2cd4eebd4abf3de3112e4837880855bed | [log] [tgz] |
|---|---|---|
| author | Chenbo Feng <fengc@google.com> | Wed Dec 12 22:41:55 2018 +0000 |
| committer | Chenbo Feng <fengc@google.com> | Wed Dec 12 14:42:50 2018 -0800 |
| tree | d123a1514ee88f4cddacf741519b9c5eaaf2aa06 | |
| parent | 4bb6730a1071b4378957442e1b13136b956f80ad [diff] |
Revert "resolve merge conflicts of 9b44fcfedc34a5f34ea08c7ed15014c4caedbd9f to master-arc-dev" This reverts commit ea08523a091984cda627dd2ebaebe7cdad1618a7. Reason for revert: This change should not be added in master. We need to keep this project identical between aosp master and internal master Change-Id: I10ba2e4126a01573b74377c04871aaed39092e6e