summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am e606cb46: docs: fix api dashboardScott Main2012-03-051-1/+1
|\
| * docs: fix api dashboardScott Main2012-03-051-1/+1
* | am 290684ac: docs: fix expansion library package nameScott Main2012-03-051-11/+12
|\ \ | |/
| * docs: fix expansion library package nameScott Main2012-03-051-11/+12
* | am a47d88a7: docs: dashboard update for march 5Scott Main2012-03-053-26/+26
|\ \ | |/
| * docs: dashboard update for march 5Scott Main2012-03-053-26/+26
* | am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s codeScott Main2012-03-051-3/+9
|\ \ | |/
| * docs: add note about declaring file sizes with sample app's codeScott Main2012-03-051-3/+9
* | am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" ...Scott Main2012-03-051-79/+87
|\ \ | |/
| * Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1Scott Main2012-03-051-79/+87
| |\
| | * docs: updates to OBB guide for naming; plus other editsScott Main2012-03-051-79/+87
* | | am 93dc642e: docs: fix misc bugs from external trackerScott Main2012-03-0510-125/+136
|\ \ \ | |/ /
| * | docs: fix misc bugs from external trackerScott Main2012-03-0210-125/+136
| |/
* | am 4143781c: docs: add docs for market OBB includes splitting the Licensing d...Scott Main2012-03-0216-2397/+3825
|\ \ | |/
| * docs: add docs for market OBBScott Main2012-03-0216-2397/+3825
* | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-020-0/+0
|\ \
| * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-03-020-0/+0
| |\ \ | | |/ | |/|
* | | am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1Robert Ly2012-03-023-56/+63
|\ \ \ | |/ /
| * | Merge "docs: fixing bug 5942573" into ics-mr1Robert Ly2012-03-023-56/+63
| |\ \
| | * | docs: fixing bug 5942573Robert Ly2012-02-223-56/+63
* | | | am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1Dianne Hackborn2012-03-021-15/+57
|\ \ \ \ | |/ / /
| * | | Merge "Make ResolverActivity update dynamically." into ics-mr1Dianne Hackborn2012-03-021-15/+57
| |\ \ \
| | * | | Make ResolverActivity update dynamically.Dianne Hackborn2012-03-011-15/+57
* | | | | am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"Adam Powell2012-03-011-2/+2
|\ \ \ \ \
| * \ \ \ \ am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"Adam Powell2012-03-011-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge "Fix dividers for LinearLayout (TabWidget)"Adam Powell2012-03-011-2/+2
| | |\ \ \ \ \
| | | * | | | | Fix dividers for LinearLayout (TabWidget)Vladimir Baryshnikov2012-01-171-2/+2
* | | | | | | | am 3e701270: Merge "extend timeout to allow for more time for the device to c...Tsu Chiang Chuang2012-03-011-2/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "extend timeout to allow for more time for the device to connect." into...Tsu Chiang Chuang2012-03-011-2/+8
| |\ \ \ \ \ \
| | * | | | | | extend timeout to allow for more time for the device to connect.Tsu Chiang Chuang2012-03-011-2/+8
* | | | | | | | am 941ff38d: Merge "fix bug 5942522" into ics-mr1Robert Ly2012-03-011-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "fix bug 5942522" into ics-mr1Robert Ly2012-03-011-1/+6
| |\ \ \ \ \ \ \
| | * | | | | | | fix bug 5942522Robert Ly2012-02-221-1/+6
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1Robert Ly2012-03-012-8/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "docs: fix bug 5878445" into ics-mr1Robert Ly2012-03-012-8/+11
| |\ \ \ \ \ \ \
| | * | | | | | | docs: fix bug 5878445Robert Ly2012-02-222-8/+11
| | |/ / / / / /
* | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-280-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-270-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-270-0/+0
| | | |\ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ am eb4f3256: Set the video encoding bit rate for the media recorder stress test.Yu Shan Emily Lau2012-02-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Set the video encoding bit rate for the mediaYu Shan Emily Lau2012-02-291-0/+1
* | | | | | | | | | | am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release ...Jean-Baptiste Queru2012-02-293-27/+86
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"Jean-Baptiste Queru2012-02-293-27/+86
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "DRM framwork bug fix: add an API to release resources"Jean-Baptiste Queru2012-02-293-27/+86
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | DRM framwork bug fix: add an API to release resourcesKei Takahashi2012-02-293-27/+86
* | | | | | | | | | | | | am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on d...Jean-Baptiste Queru2012-02-291-11/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"Jean-Baptiste Queru2012-02-291-11/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Set width of spinner's dropdown to fit on device"Jean-Baptiste Queru2012-02-291-11/+23
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Set width of spinner's dropdown to fit on deviceSeongJae Park2012-02-291-11/+23
| | | |/ / / / / / / / / /