summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | am 5801ead9: am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-061-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-061-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Removed HTML artifact from index pageAlexander Lucas2012-04-051-1/+0
| | | |_|/ / / | | |/| | | |
* | | | | | | am 5756da24: am 153f8fe4: docs: Android U: Displaying Bitmaps EfficientlyScott Main2012-04-067-0/+1244
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 153f8fe4: docs: Android U: Displaying Bitmaps EfficientlyScott Main2012-04-067-0/+1244
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | docs: Android U: Displaying Bitmaps EfficientlyScott Main2012-04-047-0/+1244
| | | |/ / / | | |/| | |
* | | | | | am ae6323dd: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDE...Trevor Johns2012-04-061-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" i...Trevor Johns2012-04-061-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1Trevor Johns2012-04-041-1/+1
| | |\ \ \ \
| | | * | | | Docs: Fixing typo in "Testing from Other IDEs" articleTrevor Johns2012-04-041-1/+1
* | | | | | | Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/framew...yoonsung.nam2012-04-060-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 99b44fdc: am f336b9fc: Merge "Updated sample app for Android Training clas...Fred Chung2012-04-041-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am f336b9fc: Merge "Updated sample app for Android Training class: Making You...Fred Chung2012-04-041-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
* | | | | | | | am 624e02d6: am f336b9fc: Merge "Updated sample app for Android Training clas...Fred Chung2012-04-041-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | am f336b9fc: Merge "Updated sample app for Android Training class: Making You...Fred Chung2012-04-041-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Updated sample app for Android Training class: Making Your App Locatio...Fred Chung2012-04-041-0/+0
| | |\ \ \ \ \
| | | * | | | | Updated sample app for Android Training class: Making Your App Location Aware.Fred Chung2012-04-041-0/+0
* | | | | | | | am 7dc67f51: am fa840e2b: Merge "docs: Android Design: v3 update (settings, n...Roman Nurik2012-04-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" i...Roman Nurik2012-04-0451-163/+917
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | am 32a035d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, n...Roman Nurik2012-04-0451-163/+917
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" i...Roman Nurik2012-04-0451-163/+917
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1Roman Nurik2012-04-0451-163/+917
| | |\ \ \ \ \ \
| | | * | | | | | docs: Android Design: v3 update (settings, navigation)Roman Nurik2012-04-0451-163/+917
* | | | | | | | | am 4a219e6b: am a784b3de: Fix build break introduced by missing parenthesis i...Jason Noguchi2012-04-030-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am a784b3de: Fix build break introduced by missing parenthesis in camera stre...Jason Noguchi2012-04-031-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis i...Jason Noguchi2012-04-031-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am a784b3de: Fix build break introduced by missing parenthesis in camera stre...Jason Noguchi2012-04-031-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fix build break introduced by missing parenthesis in camera stress test.Jason Noguchi2012-04-031-1/+1
* | | | | | | | | am 9cb941d5: am 43562ecf: Merge "Creating new "Optimizing for TV" training." ...Megha Joshi2012-04-030-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1Megha Joshi2012-04-037-0/+680
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/framew...Jason Noguchi2012-04-037-0/+680
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 5a894a35: am 43562ecf: Merge "Creating new "Optimizing for TV" training." ...Megha Joshi2012-04-037-0/+680
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1Megha Joshi2012-04-037-0/+680
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Creating new "Optimizing for TV" training." into ics-mr1Megha Joshi2012-04-037-0/+680
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Creating new "Optimizing for TV" training.Megha Joshi2012-04-037-0/+680
| | | | | |_|_|/ / / | | | | |/| | | | |
| * | | | | | | | | am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework st...Jason Noguchi2012-04-033-7/+331
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." ...Jason Noguchi2012-04-033-7/+331
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
* | | | | | | | | | am 9e88e82e: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework st...Jason Noguchi2012-04-033-7/+331
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." ...Jason Noguchi2012-04-033-7/+331
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1Jason Noguchi2012-04-033-7/+331
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Adding camera zoom test to mediaframework stress suite.Jason Noguchi2012-03-223-7/+331
* | | | | | | | | | Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/framew...Scott Main2012-04-031-0/+28
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | am ad5789c6: am c70e89e2: Fix hybrid buildChris Craik2012-04-031-0/+28
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | am c70e89e2: Fix hybrid buildChris Craik2012-04-031-0/+28
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Fix hybrid buildChris Craik2012-04-031-0/+28
| * | | | | | | | | am 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid ...Scott Main2012-04-032-18/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags ...Scott Main2012-04-032-18/+16
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
* | | | | | | | | | am ac15e96e: am 0687c830: Merge "docs: change markup for "new" tags to avoid ...Scott Main2012-04-032-18/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags ...Scott Main2012-04-032-18/+16
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "docs: change markup for "new" tags to avoid the new tags wraping solo"...Scott Main2012-04-032-18/+16
| | |\ \ \ \ \ \ \