| commit | afd09db4f7de041e2a88cc709912dbd1cfa96dc9 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Mon Apr 25 21:55:41 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 25 21:55:43 2016 +0000 |
| tree | 648fc850ff8639e32712ad1603cd76075797862a | |
| parent | 6c0291c144e28b958718a8bcdc9a02de99f2bcf4 [diff] | |
| parent | 5df7298c590e97bc73ebf0d3ceda9ab8f809a136 [diff] |
Merge "resolve merge conflicts of c79a568 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp