| commit | 5d4880ec47abb29bef2786d592cd3c5eeed60b27 | [log] [tgz] |
|---|---|---|
| author | Sailesh Nepal <sail@google.com> | Sat Feb 20 10:32:15 2016 -0800 |
| committer | Sailesh Nepal <sail@google.com> | Sat Feb 20 10:32:15 2016 -0800 |
| tree | edee7a8dcc1f94e384570a5eb486096aecfc6d3e | |
| parent | 2aae9696d1f3fc9f2492a7041d1741da60b73bae [diff] | |
| parent | 5a47b42a47679fec67bee78eb08dac058e52937b [diff] |
resolve merge conflicts of 2b40aef364 to nyc-dev-plus-aosp Change-Id: I755ca6692c807ba338e1c295e1f72019272f149b