| commit | b7d33c073940f3ed54aaa624680b5e37c27bf455 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Mar 15 16:28:57 2016 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Mar 15 16:28:57 2016 -0700 |
| tree | 714321a8541f666c4f55281c6843f60e63b9db11 | |
| parent | 55fad07057c2b5173538bc4e16340ff7ece55d4c [diff] |
Revert "resolve merge conflicts of fc16dca602 to nyc-dev-plus-aosp" This reverts commit c9a19779a219bd9e4dd162d30249be7d22020c67, reversing changes made to 3912b35cfcb1896a0625164bf2163e7a6145ed8d.