| commit | 44d93a063c34db90712f158c37d9329709282b5f | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri May 20 14:41:50 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Fri May 20 14:41:50 2016 -0700 |
| tree | cfdc4020aad05dc466f70ce10ec75cfc08d2134e | |
| parent | f2e886c2a7851659feb192c97e508a7952426997 [diff] | |
| parent | e375c689caefda63e5407bd6df41bece40059484 [diff] |
resolve merge conflicts of e375c68 to nyc-dev-plus-aosp Change-Id: Ic6b535f7b078b674603c2df6d4ff66b29ff54c26