| commit | c21d84360698235ab60cf340c18441ea7c490065 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Mon Apr 25 22:52:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 25 22:52:19 2016 +0000 |
| tree | ad856acb13815b842d0c07e2275e2d072a26ee27 | |
| parent | 596e8588b181f33e232788379f5ceca35d3afb50 [diff] | |
| parent | f6784cd0dd600d7315def2ec521dc0f7d474b777 [diff] |
resolve merge conflicts of afd09db to nyc-mr1-dev-plus-aosp am: f6784cd * commit 'f6784cd0dd600d7315def2ec521dc0f7d474b777': Change-Id: Iabdfc7e27557677158d6ff107c8e0ad27b1ddcea