summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* docs: fix a couple typosScott Main2011-06-202-2/+2
* docs: fix broken linkScott Main2011-06-201-1/+1
* Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90...Robert Ly2011-06-201-6/+16
|\
| * cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7Robert Ly2011-06-161-6/+16
* | Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb...Robert Ly2011-06-201-1/+2
|\ \
| * | cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cbRobert Ly2011-06-161-1/+2
| |/
* | Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)Mathias Agopian2011-06-167-68/+111
* | Merge "Revert "Do not merge. Return null id for Non-phone device."" into hone...John Wang2011-06-161-4/+0
|\ \
| * | Revert "Do not merge. Return null id for Non-phone device."John Wang2011-06-161-4/+0
* | | SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-167-6/+72
* | | Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into...Dianne Hackborn2011-06-161-8/+48
|\ \ \
| * | | New orientation handling. Only impacts SDK (aapt dump badging).Dianne Hackborn2011-06-161-8/+48
| | |/ | |/|
* | | Merge "DO NOT MERGE" into honeycomb-mr2Robert Greenwalt2011-06-161-7/+9
|\ \ \
| * | | DO NOT MERGERobert Greenwalt2011-06-161-7/+9
| |/ /
* | | Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
|/ /
* | revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)Mathias Agopian2011-06-156-90/+10
* | Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"Mathias Agopian2011-06-156-10/+90
* | Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into...Mathias Agopian2011-06-156-90/+10
|\ \
| * | revert surfaceflinger leak fix as it uncovered a crasher on xoomMathias Agopian2011-06-156-90/+10
* | | Merge "We must keep up with the Joneses." into honeycomb-mr2Dianne Hackborn2011-06-152-0/+29
|\ \ \
| * | | We must keep up with the Joneses.Dianne Hackborn2011-06-152-0/+29
| |/ /
* | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2Eric Fischer2011-06-1581-444/+692
|\ \ \ | |/ / |/| |
| * | Import revised translations. DO NOT MERGEEric Fischer2011-06-1581-444/+692
* | | Merge "Updated art for compat mode dialog." into honeycomb-mr2Justin Ho2011-06-1516-27/+40
|\ \ \
| * | | Updated art for compat mode dialog.Daniel Sandler2011-06-1516-27/+40
| |/ /
* | | Merge "Fix lease duration handling" into honeycomb-mr2Irfan Sheriff2011-06-151-7/+18
|\ \ \ | |/ / |/| |
| * | Fix lease duration handlingIrfan Sheriff2011-06-151-7/+18
* | | Clean up some edge cases in the compat mode UI:Dianne Hackborn2011-06-152-9/+29
|/ /
* | Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2Daniel Sandler2011-06-157-1/+125
|\ \
| * | One-time-only compatibility mode explanation dialog.Daniel Sandler2011-06-157-1/+125
* | | Merge "Final UI for compatibility mode." into honeycomb-mr2Daniel Sandler2011-06-1522-40/+250
|\ \ \ | |/ /
| * | Final UI for compatibility mode.Daniel Sandler2011-06-1522-40/+250
* | | Testing done, compatibility mode no longer on by default.Dianne Hackborn2011-06-141-7/+1
* | | Fix a major problem in fragment lifecycle.Dianne Hackborn2011-06-143-11/+30
|/ /
* | Merge "Fix issue #4592768: Xoom display does not resize when..." into honeyco...Dianne Hackborn2011-06-141-1/+1
|\ \
| * | Fix issue #4592768: Xoom display does not resize when...Dianne Hackborn2011-06-141-1/+1
* | | Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d7...Robert Ly2011-06-141-9/+9
|\ \ \
| * | | cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7dRobert Ly2011-06-141-9/+9
* | | | Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e4...Robert Ly2011-06-141-35/+35
|\ \ \ \
| * | | | cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbcRobert Ly2011-06-091-35/+35
| |/ / /
* | | | Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d...Robert Ly2011-06-142-3/+86
|\ \ \ \
| * | | | cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186acRobert Ly2011-06-142-3/+86
| |/ / /
* | | | Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b859...Robert Ly2011-06-141-20/+3
|\ \ \ \
| * | | | Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf9...Robert Ly2011-06-141-20/+3
* | | | | Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34b...Robert Ly2011-06-141-2/+1
|\ \ \ \ \
| * | | | | Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4e...Robert Ly2011-06-141-2/+1
* | | | | | Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2Amith Yamasani2011-06-141-2/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Stability fixes for PreferenceFragments.Amith Yamasani2011-06-141-2/+7
* | | | | | Merge "Fix issue #4603422: Compatibility mode button doesn't always update" i...Dianne Hackborn2011-06-149-58/+51
|\ \ \ \ \ \
| * | | | | | Fix issue #4603422: Compatibility mode button doesn't always updateDianne Hackborn2011-06-149-58/+51
| |/ / / / /