| commit | 5df7298c590e97bc73ebf0d3ceda9ab8f809a136 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Mon Apr 25 15:53:50 2016 -0600 |
| committer | Jeff Sharkey <jsharkey@android.com> | Mon Apr 25 15:53:50 2016 -0600 |
| tree | 648fc850ff8639e32712ad1603cd76075797862a | |
| parent | 090072200c31cb2771308d2e155fadc4ada00cb8 [diff] | |
| parent | c79a568f18dde1590d361989ff0cb6b19a61b2e9 [diff] |
resolve merge conflicts of c79a568 to nyc-dev-plus-aosp Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22