| commit | 737afb98c9c1be26ef7d8052696673bb657948b8 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Mon Jul 11 11:42:53 2016 -0700 |
| committer | Tianjie Xu <xunchang@google.com> | Mon Jul 11 11:42:53 2016 -0700 |
| tree | 780fb7b27316c961fb267d9c0d042857a0ceb359 | |
| parent | 6bd0909da94087401960c1840726dd8ffb9d06b7 [diff] | |
| parent | 333df6c1d15a5ed951b0dacb782a7612d86aa3d4 [diff] |
resolve merge conflicts of 333df6c to nyc-mr1-dev-plus-aosp Change-Id: Ibe66a7c78073a9c3e9f139bd6b00a0afab075190