| commit | 20fd80d0e610b851d98986a351e6ce6fce7cecf2 | [log] [tgz] |
|---|---|---|
| author | David Pursell <dpursell@google.com> | Mon Jun 06 16:51:08 2016 -0700 |
| committer | David Pursell <dpursell@google.com> | Mon Jun 06 16:51:08 2016 -0700 |
| tree | 496635f59fefbe27946dc41bf283b83db3ca6d5a | |
| parent | 27a68ef007734929a6cfb46c233c5b1757f7786c [diff] | |
| parent | a6d56611404f2e1c0c9f4ab7c8471af0e80b2026 [diff] |
resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp Change-Id: I7bf63eae8c13ffd512483e940bb5c35e8ce4e36e