summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8:...Dirk Dougherty2013-04-201-306/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc c...Dirk Dougherty2013-04-201-306/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: update...Dirk Dougherty2013-04-201-306/+75
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet ...Dirk Dougherty2013-04-201-306/+75
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." i...Dirk Dougherty2013-04-201-306/+75
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-devDirk Dougherty2013-04-201-306/+75
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / / | | | | | | |/| | | | | | |
| | | | | | * | | | | | | | Merge "Doc change: updates for tablet checklist." into jb-mr1-devDirk Dougherty2013-04-201-306/+75
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | Doc change: updates for tablet checklist.Dirk Dougherty2013-04-201-306/+75
* | | | | | | | | | | | | | | am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am...Selim Gurun2013-04-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6:...Selim Gurun2013-04-203-7/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e:...Selim Gurun2013-04-203-7/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE...Selim Gurun2013-04-203-7/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimi...Selim Gurun2013-04-203-7/+26
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between s...Selim Gurun2013-04-203-7/+26
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / /
| | | | | | * | | | | | | | | am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and hostSelim Gurun2013-04-203-7/+26
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and hostSelim Gurun2013-04-043-7/+26
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | DO NOT MERGE Add a delimiter between scheme and hostSelim Gurun2013-04-043-7/+26
* | | | | | | | | | | | | | | | | am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654:...Selim Gurun2013-04-203-26/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68:...Selim Gurun2013-04-203-26/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4:...Selim Gurun2013-04-203-26/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add ...Selim Gurun2013-04-203-26/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter b...Selim Gurun2013-04-203-26/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / /
| | | | | * | | | | | | | | | | | am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme...Selim Gurun2013-04-203-26/+7
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / /
| | | | | | * | | | | | | | | | | am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"Selim Gurun2013-04-203-26/+7
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / /
| | | | | | | * | | | | | | | | | am 38915fd4: Revert "Add a delimiter between scheme and host"Selim Gurun2013-04-043-26/+7
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / /
| | | | | | | | * | | | | | | | | Revert "Add a delimiter between scheme and host"Selim Gurun2013-04-043-26/+7
* | | | | | | | | | | | | | | | | am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am...Geremy Condra2013-04-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE...Geremy Condra2013-04-193-4/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit...Geremy Condra2013-04-193-4/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\'...Geremy Condra2013-04-193-4/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bpGeremy Condra2013-04-193-4/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / /
| | | | | * | | | | | | | | | | | am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bpGeremy Condra2013-04-193-4/+24
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / /
| | | | | | * | | | | | | | | | | DO NOT MERGE Merge commit '8225df00' into bpGeremy Condra2013-04-183-4/+24
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / | | | | | | | | | / / / / / / / / | | | | | | | |_|/ / / / / / / / | | | | | | |/| | | | | | | | |
| | | | | | | * | | | | | | | | am aa2163dd: Add a delimiter between scheme and hostSelim Gurun2013-04-033-7/+26
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / /
| | | | | | | | * | | | | | | | Add a delimiter between scheme and hostSelim Gurun2013-04-013-7/+26
* | | | | | | | | | | | | | | | Merge "Add new error code for Debug Context work." into jb-mr2-devStephen Hines2013-04-201-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add new error code for Debug Context work.Stephen Hines2013-04-171-1/+16
* | | | | | | | | | | | | | | | | Merge "Revert all recent GLSurfaceView changes." into jb-mr2-devJeff Brown2013-04-201-397/+662
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Revert all recent GLSurfaceView changes.Jeff Brown2013-04-191-397/+662
* | | | | | | | | | | | | | | | | Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb...Fabrice Di Meglio2013-04-202-303/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix bug #8656546 API REVIEW: android.text.bidi / android.textFabrice Di Meglio2013-04-192-303/+35
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Change doc comment to match API changeKenny Root2013-04-191-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into j...Christopher Tate2013-04-191-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Provide SharedPreferences coherence guarantees for BackupAgentChristopher Tate2013-04-191-0/+48
* | | | | | | | | | | | | | | | Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-devVictoria Lease2013-04-191-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | do not attempt to parcel unknown ParcelableSpansVictoria Lease2013-04-191-3/+17
* | | | | | | | | | | | | | | | | Merge "Follow up on issue #8159072: Spinner widget should be RTL'ized" into j...Dianne Hackborn2013-04-192-22/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Follow up on issue #8159072: Spinner widget should be RTL'izedDianne Hackborn2013-04-192-22/+43
* | | | | | | | | | | | | | | | | | Merge "Improve javadoc for rotationAnimation." into jb-mr2-devCraig Mautner2013-04-191-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Improve javadoc for rotationAnimation.Craig Mautner2013-04-191-4/+5
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |