| commit | d5e20761c27657e6aa31992926c10a95e48b233c | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu May 26 12:57:16 2016 +0100 |
| committer | Vladimir Marko <vmarko@google.com> | Thu May 26 12:57:16 2016 +0100 |
| tree | cb61db1ce2099242a8f569d700c8642ed4036dc3 | |
| parent | 275bed4cf1929d9c431101509604fa50b887f01c [diff] | |
| parent | 6c5b9b91136aa4939d0252eb719c86289c72780e [diff] |
resolve merge conflicts of 6c5b9b9 to nyc-dev-plus-aosp Change-Id: I004b6b059d287123e99708f412b667df831a3bb7