summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782Scott Main2011-07-276-108/+823
* cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578eScott Main2011-07-271-52/+59
* cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22eScott Main2011-07-272-3/+3
* cherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947eScott Main2011-07-271-12/+12
* cherrypick Change-Id: Ic41d05c61e7b20d9303384c63528f0a79b22310bScott Main2011-07-271-1/+1
* cherrypick Change-Id: I4b79345daeec7087581b459e75f24f0f1b8d7252Scott Main2011-07-271-12/+11
* cherrypick Change-Id: Id634f16b9498584932e101934fc60648ee469783Scott Main2011-07-272-73/+137
* cherrypick Change-Id: Ibb49b9579902ee2887470e3bcc4f400ac97a51c3Scott Main2011-07-272-18/+18
* Change-Id: I2134948e83bdca3f85c501b5d4f65c1c630f1b85Scott Main2011-07-273-82/+120
* Merge "cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0 fix do...Scott Main2011-07-271-2/+2
|\
| * cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0Scott Main2011-07-271-2/+2
* | Merge "cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3 fix sd...Scott Main2011-07-271-5/+4
|\ \ | |/
| * cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3Scott Main2011-07-271-5/+4
* | cherrypick Change-Id: Ib2decf325271c50cac3202bad8c4bbbc40d233f2Scott Main2011-07-272-30/+71
|/
* Merge "cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c docs: ...Scott Main2011-07-271-6/+14
|\
| * cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036cScott Main2011-07-271-6/+14
* | Merge "cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01 docs: ...Scott Main2011-07-271-4/+2
|\ \ | |/
| * cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01Scott Main2011-07-271-4/+2
* | Merge "cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299 docs: ...Scott Main2011-07-271-0/+3
|\ \ | |/
| * cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299Scott Main2011-07-271-0/+3
* | Merge "cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299 docs: ...Scott Main2011-07-277-196/+730
|\ \ | |/
| * cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299Scott Main2011-07-277-196/+730
* | Merge "Issue 3370834: No Echo canceler for SIP"Eric Laurent2011-07-272-18/+66
|\ \
| * | Issue 3370834: No Echo canceler for SIPEric Laurent2011-07-272-18/+66
* | | Merge "Disable Crankshaft in DRT for performance testing."Guang Zhu2011-07-271-1/+1
|\ \ \
| * | | Disable Crankshaft in DRT for performance testing.Ben Murdoch2011-07-271-1/+1
* | | | cherrypick Change-Id: I4713d3977a0a1514ff9c4217e7f3723c0346d0d8Scott Main2011-07-273-4/+15
| |_|/ |/| |
* | | Merge "Fix USB tethering again"Mike Lockwood2011-07-271-1/+8
|\ \ \
| * | | Fix USB tethering againMike Lockwood2011-07-271-1/+8
* | | | Merge "Make sure that suggestions are queried on focus or tapping."Amith Yamasani2011-07-271-1/+14
|\ \ \ \
| * | | | Make sure that suggestions are queried on focus or tapping.Amith Yamasani2011-07-261-1/+14
* | | | | Merge "Handle callbacks to CollapsibleActionViews that are in an actionLayout."Amith Yamasani2011-07-273-7/+11
|\ \ \ \ \
| * | | | | Handle callbacks to CollapsibleActionViews that are in an actionLayout.Amith Yamasani2011-07-263-7/+11
| |/ / / /
* | | | | Reconcile with gingerbread-mr4-releaseThe Android Open Source Project2011-07-270-0/+0
|\ \ \ \ \
| * | | | | NFC Adapter Extras API update.Nick Pelly2011-07-252-14/+12
* | | | | | Merge "Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b1...Bill Gruber2011-07-277-64/+97
|\ \ \ \ \ \
| * | | | | | Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536fa...Bill Gruber2011-07-277-64/+97
* | | | | | | Merge "Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64...Bill Gruber2011-07-272-9/+8
|\ \ \ \ \ \ \
| * | | | | | | Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244...Bill Gruber2011-07-272-9/+8
* | | | | | | | Merge "cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c998...Robert Ly2011-07-272-6/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51Robert Ly2011-07-262-6/+76
* | | | | | | | | Merge "cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d...Robert Ly2011-07-271-17/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4Robert Ly2011-07-261-17/+20
| |/ / / / / / / /
* | | | | | | | | Merge "cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8...Robert Ly2011-07-271-32/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7bRobert Ly2011-07-261-32/+76
| |/ / / / / / / /
* | | | | | | | | Merge "cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff1...Robert Ly2011-07-271-21/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989Robert Ly2011-07-261-21/+36
| |/ / / / / / / /
* | | | | | | | | Merge "cherrypick from hc-mr2 Change-Id: Iab11fd9bf007d2e2dcfd7b26a6b8539ed35...Robert Ly2011-07-271-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherrypick from hc-mr2 Change-Id: Iab11fd9bf007d2e2dcfd7b26a6b8539ed35cf60eRobert Ly2011-07-261-5/+1
| |/ / / / / / / /
* | | | | | | | | Merge "resolved conflicts for merge of af75fdb1 to master"Robert Greenwalt2011-07-271-7/+1
|\ \ \ \ \ \ \ \ \