| commit | 26b08c5bd11f3117d884b31f96e28326f042b655 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Mon Mar 28 16:43:59 2016 -0700 |
| committer | Glenn Kasten <gkasten@google.com> | Mon Mar 28 16:43:59 2016 -0700 |
| tree | a1ef4be317106fc1978dbbdf19cafbba019d5bbb | |
| parent | b473ea3672b6457cc191413dc7c127fe24eb6fcc [diff] | |
| parent | 2e38388b6ce265c9b97c1589ab59a3ef393811a2 [diff] |
resolve merge conflicts of 2e38388 to nyc-dev-plus-aosp Change-Id: I2afe946bf11c74f13ff6153def15a6db814acb47