| commit | 422e63decc7e809b7d68a2eeccd4bc9191232325 | [log] [tgz] |
|---|---|---|
| author | Ang Li <angli@google.com> | Wed Mar 30 17:47:02 2016 -0700 |
| committer | Ang Li <angli@google.com> | Wed Mar 30 17:47:02 2016 -0700 |
| tree | bf0b67e4d6a3c3e00610b023449e30d6cb171842 | |
| parent | 0f192046b8ffcf0fa8e3abaca83b557caccbc7df [diff] | |
| parent | d58100d5f819a3ce1431a24ae2b05a7fc342c2e9 [diff] |
resolve merge conflicts of d58100d to nyc-dev-plus-aosp Change-Id: I5c8b41611e125a8e8dccd86a8af41ea22e6e99f8