| commit | 4ed2ff913b5656b2197147aed9ee94a4dde0d8c2 | [log] [tgz] |
|---|---|---|
| author | Shinichiro Hamaji <hamaji@google.com> | Fri May 13 14:33:09 2016 +0900 |
| committer | Shinichiro Hamaji <hamaji@google.com> | Fri May 13 14:33:34 2016 +0900 |
| tree | 3ca603914d2d3394158bba30b1cd2658fecda905 | |
| parent | 2697421213c42e791affe2f2784774c2c4c09dc2 [diff] | |
| parent | 505f1eaaa9892423ec4fed256a755bcee3e3a988 [diff] |
resolve merge conflicts of 505f1ea to nyc-dev-plus-aosp Change-Id: I023ace4df452371eea1b0b004d8817e6fe90585e