| commit | 067d95dd2beb5ecbe3b721e1e8787dab2030fc44 | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Fri Apr 22 16:09:53 2016 +0100 |
| committer | Tobias Thierer <tobiast@google.com> | Fri Apr 22 16:09:53 2016 +0100 |
| tree | 81150af87a017ac374393f9bff143e7aaf88c05f | |
| parent | dde611dcd69b0224d0607198efa7b506a93fab7c [diff] | |
| parent | 9d1357c44eb8b0872af0d73059df1ba2ae29ab30 [diff] |
resolve merge conflicts of 9d1357c to nyc-dev-plus-aosp Change-Id: Ifc9ed03cca4d751fd1fcc9d0572369a49d64a9ad