| commit | cceedf75c4c849638d65c21909f08d2f98728555 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Wed Mar 23 22:40:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 23 22:40:16 2016 +0000 |
| tree | b5c079059ffebeff3ed12e800bb1eccc31e47f79 | |
| parent | ec663de64b0a1b50e11019595e5cb5fb421b536c [diff] | |
| parent | dc3b8521256eaec189e8dd6335df40fd2493adb1 [diff] |
resolve merge conflicts of 8416096 to nyc-dev-plus-aosp am: dc3b852 * commit 'dc3b8521256eaec189e8dd6335df40fd2493adb1': Remove custom copy rules, stop using ACP