summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-05-272-41/+41
* Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-devMatthew Xie2013-05-262-4/+4
|\
| * Revert "Change GATT_FAILURE from 0 to 0x101"Matthew Xie2013-05-262-4/+4
* | Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-devMatthew Xie2013-05-262-4/+4
|\ \ | |/
| * Change GATT_FAILURE from 0 to 0x101Matthew Xie2013-05-232-4/+4
* | Merge "Update test with CamercorderProfile video size." into jb-mr2-devYu Shan Emily Lau2013-05-251-16/+15
|\ \
| * | Update test with CamercorderProfile video size.Yu Shan Emily Lau2013-05-231-16/+15
* | | Merge "add links to orientation flags in attribute docs to help determine the...Scott Main2013-05-252-22/+81
|\ \ \
| * | | add links to orientation flags in attribute docsScott Main2013-05-242-22/+81
* | | | Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" int...Romain Guy2013-05-251-1/+1
|\ \ \ \
| * | | | TransitionDrawable should not become a LayerDrawableRomain Guy2013-05-241-1/+1
* | | | | Merge "fix javadoc links. turns out, without parameters, javadoc will link to...Scott Main2013-05-241-4/+4
|\ \ \ \ \
| * | | | | fix javadoc links.Scott Main2013-05-221-4/+4
* | | | | | Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-devAlan Viverette2013-05-241-2/+15
|\ \ \ \ \ \
| * | | | | | DO NOT MERGE. Fix number picker accessibility focus.Alan Viverette2013-05-241-2/+15
* | | | | | | Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-devMichael Wright2013-05-243-13/+125
|\ \ \ \ \ \ \
| * | | | | | | Pipe through bounding box information (DO NOT MERGE)Michael Wright2013-05-233-13/+125
* | | | | | | | Merge "Add missing native methods." into jb-mr2-devDeepanshu Gupta2013-05-246-36/+94
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Add missing native methods.Deepanshu Gupta2013-05-236-36/+94
* | | | | | | | Merge "Use the old interface when resetting connections" into jb-mr2-devRobert Greenwalt2013-05-241-3/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Use the old interface when resetting connectionsRobert Greenwalt2013-05-231-3/+4
* | | | | | | | am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Libr...Joe Fernandez2013-05-231-0/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Relea...Joe Fernandez2013-05-231-0/+2
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am a502c59e: docs: Add FileProvider to Support Library r13 Release NotesJoe Fernandez2013-05-231-0/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | docs: Add FileProvider to Support Library r13 Release NotesJoe Fernandez2013-05-231-0/+2
* | | | | | | | | | | Merge "Check for invalid pointer index in PagedView" into jb-mr2-devJim Miller2013-05-231-1/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check for invalid pointer index in PagedViewJim Miller2013-05-221-1/+4
* | | | | | | | | | | | Merge "Compare binder instances when checking if listeners match." into jb-mr...Andrew Wilson2013-05-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Compare binder instances when checking if listeners match.Andrew Wilson2013-05-221-1/+2
* | | | | | | | | | | | | Merge "Restore previous alpha value on noop'd DisplayList operations" into jb...Chet Haase2013-05-231-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Restore previous alpha value on noop'd DisplayList operationsChet Haase2013-05-231-1/+3
* | | | | | | | | | | | | | am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc u...kmccormick2013-05-231-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GC...kmccormick2013-05-231-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into j...kmccormick2013-05-231-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docskmccormick2013-05-231-0/+9
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docskmccormick2013-05-231-0/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge "Doc update: fix GCM TOC" into jb-mr1.1-docskmccormick2013-05-231-0/+9
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Doc update: fix GCM TOCkmccormick2013-05-221-0/+9
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-2348-117/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-2248-117/+69
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Fix account filtering for specific package name" into jb-mr2-devAmith Yamasani2013-05-231-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix account filtering for specific package nameAmith Yamasani2013-05-221-4/+11
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Move offline-pdk to where the source is." into jb-mr2-devYing Wang2013-05-231-22/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Move offline-pdk to where the source is.Ying Wang2013-05-211-22/+0
* | | | | | | | | | | | | | | | | am cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docsScott Main2013-05-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 38b9aaa0: am 2cc84c63: add VID for Haier to docsScott Main2013-05-221-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 2cc84c63: add VID for Haier to docsScott Main2013-05-221-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | add VID for Haier to docsScott Main2013-05-221-0/+4
* | | | | | | | | | | | | | | | Merge "Add a queue of pending finished input events." into jb-mr2-devJeff Brown2013-05-221-11/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add a queue of pending finished input events.Jeff Brown2013-05-221-11/+82
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |