| commit | eb613b3c1425b0bc12e7a2beb5420debe479eeb6 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu May 26 14:20:42 2016 +0100 |
| committer | Vladimir Marko <vmarko@google.com> | Thu May 26 14:20:42 2016 +0100 |
| tree | 1b5e7ab7eb3cf0cec6ba02c51b83dfc34e8413e4 | |
| parent | d5e20761c27657e6aa31992926c10a95e48b233c [diff] | |
| parent | 72e2eef6e070371ff78cfb4ba805dbe4b4fca41b [diff] |
resolve merge conflicts of 72e2eef to nyc-dev-plus-aosp Change-Id: If2db336eb85e4d67506f44c1ea0f0c32071bd7ab