| commit | 78cb078dd2b6f665656a7473c40d82513a4c482f | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Thu Mar 03 11:50:37 2016 +0000 |
| committer | Calin Juravle <calin@google.com> | Thu Mar 03 11:50:37 2016 +0000 |
| tree | 9db005aa50e9621d166118c3e38ac1cb893812de | |
| parent | f51df9464a91bc827c8ec4058e7695c5a1be6d31 [diff] | |
| parent | 7a2ff82b2914ab36924811e87db2a8f58a7a66b2 [diff] |
resolve merge conflicts of 7a2ff82b29 to nyc-dev-plus-aosp Change-Id: Ibbd4c6e39b1e30aa1aec7ff6edb0b9a01c585fb3