| commit | c34219624939ee722597dc8a3fa98105a472f4ab | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed May 11 19:51:33 2016 -0700 |
| committer | Ying Wang <wangying@google.com> | Wed May 11 19:51:33 2016 -0700 |
| tree | 217624bf4b9ab8dc693e9f6ba8bf666614b05ba8 | |
| parent | 302ab270d64c73a701e87131474d00c2aedaee8a [diff] | |
| parent | b97dd87037d28082cdf550f17b7b770b95f59865 [diff] |
resolve merge conflicts of b97dd87 to nyc-dev-plus-aosp Change-Id: I708720fd21d86339be9f6d55be03cf89ebf6075d