| commit | 732759edd3a2d8cc63be11755db2e8f6c5dc2c63 | [log] [tgz] |
|---|---|---|
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | Thu May 18 12:22:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 18 12:22:33 2017 +0000 |
| tree | 208a92803de75714b0d5158e14b720a06e2906a9 | |
| parent | c5e03127564dd75756ff794ed62028f0ea938d05 [diff] | |
| parent | 3a9f256329b17d192e0018ae58a3d125b94f78bf [diff] |
resolve merge conflicts of 2ce1b38e85af to oc-dev-plus-aosp am: 3a9f256329 -s ours Change-Id: If5f8e616ae84df0b850aa29d2db06961e91acc1a