| commit | 6c8b2778828bd453767b3843b5ab4ff9f744821d | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Thu Mar 17 16:09:03 2016 -0700 |
| committer | Dimitry Ivanov <dimitry@google.com> | Thu Mar 17 16:09:03 2016 -0700 |
| tree | 22d835a25d33c4653d22b2b21126eb67a9731921 | |
| parent | 410cfc1bc26e8a0f1957289080ba172703ad4c02 [diff] | |
| parent | ef25ee8acc408cfc3d29553abee977dc93aa7603 [diff] |
resolve merge conflicts of a86d846 to nyc-dev-plus-aosp Change-Id: I76bc89ff72e4eb11a6c39943336ffbdab16c0dc2