summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "fix a bug where some accounts changed listeners don't see the new vers...Fred Quintana2010-07-151-16/+16
|\
| * fix a bug where some accounts changed listeners don't see the newFred Quintana2010-07-151-16/+16
* | Merge "Fix Emulator boot."Robert Greenwalt2010-07-151-2/+2
|\ \
| * | Fix Emulator boot.Robert Greenwalt2010-07-151-2/+2
* | | Merge "Handle Input and network signal changes for HID and tethering."Jaikumar Ganesh2010-07-152-3/+15
|\ \ \
| * | | Handle Input and network signal changes for HID and tethering.Jaikumar Ganesh2010-07-152-3/+15
| |/ /
* | | Merge "Populate java objects with native data from a3d file. Remove legacy co...Alex Sakhartchouk2010-07-1510-21/+236
|\ \ \
| * | | Populate java objects with native data from a3d file.Alex Sakhartchouk2010-07-1510-21/+236
| |/ /
* | | Merge "Add support for BitmapShader."Romain Guy2010-07-1511-51/+407
|\ \ \
| * | | Add support for BitmapShader.Romain Guy2010-07-1511-51/+407
* | | | Fix bug where loader listener would be registered twice.Dianne Hackborn2010-07-154-66/+96
| |/ / |/| |
* | | Merge "Making Program*.Builder classes' setters return 'this'"Jim Shuma2010-07-155-13/+26
|\ \ \
| * | | Making Program*.Builder classes' setters return 'this'Jim Shuma2010-07-155-13/+26
* | | | Merge "Don't cast CONNECTING msgs to CONNECTED."Robert Greenwalt2010-07-151-3/+3
|\ \ \ \
| * | | | Don't cast CONNECTING msgs to CONNECTED.Robert Greenwalt2010-07-151-3/+3
* | | | | Merge "Add some javadoc to AudioRecord, plus updates based on code review com...Dave Sparks2010-07-152-5/+9
|\ \ \ \ \
| * | | | | Add some javadoc to AudioRecord, plus updates based on code review comments.Dan Tasse2010-07-142-5/+9
* | | | | | am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in...Steve Howard2010-07-152-2/+31
|\ \ \ \ \ \
| * \ \ \ \ \ am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" ...Steve Howard2010-07-152-2/+31
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Interface support for custom HTTP headers in DL manager" into gingerbreadSteve Howard2010-07-152-2/+31
| | |\ \ \ \ \ \
| | | * | | | | | Interface support for custom HTTP headers in DL managerSteve Howard2010-07-152-2/+31
* | | | | | | | | Merge changes I93364c74,I5ca831b8Mike Lockwood2010-07-1512-7/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Exclude MTP implementation from simulator buildMike Lockwood2010-07-156-0/+56
| * | | | | | | | | Fixes for simulator build on lucidMike Lockwood2010-07-156-7/+7
* | | | | | | | | | am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the ...Scott Main2010-07-1521-213/+1399
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources doc...Scott Main2010-07-1521-213/+1399
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am 38137d7a: Merge "docs: lots of additions to the resources docs new drawabl...Scott Main2010-07-1521-213/+1399
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "docs: lots of additions to the resources docs new drawable resources a...Scott Main2010-07-1521-213/+1399
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | docs: lots of additions to the resources docsScott Main2010-06-2121-213/+1399
* | | | | | | | | | | | am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authori...James Dong2010-07-156-53/+152
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am d6a85a21: Merge "Support user-supplied timescales for authoring" into ging...James Dong2010-07-156-53/+152
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Support user-supplied timescales for authoring" into gingerbreadJames Dong2010-07-156-53/+152
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Support user-supplied timescales for authoringJames Dong2010-07-146-53/+152
* | | | | | | | | | | | | am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into ...Joe Onorato2010-07-152-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 562124e8: Merge "Clean up some style in the makefiles." into gingerbreadJoe Onorato2010-07-152-10/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Clean up some style in the makefiles." into gingerbreadJoe Onorato2010-07-152-10/+12
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Clean up some style in the makefiles.Joe Onorato2010-07-142-10/+12
* | | | | | | | | | | | | | am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly ...Joe Onorato2010-07-151-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | / / / / / / / | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | am 3a053db2: Merge "The ICU data is no longer compiled directly into the shar...Joe Onorato2010-07-151-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "The ICU data is no longer compiled directly into the shared library." ...Joe Onorato2010-07-151-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | The ICU data is no longer compiled directly into the shared library.Joe Onorato2010-07-131-1/+0
* | | | | | | | | | | | | Merge "checkpoint tablet status bar"Joe Onorato2010-07-1516-1569/+1948
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | checkpoint tablet status barJoe Onorato2010-07-1216-1569/+1948
* | | | | | | | | | | | | | Add various properties to View to allow it to be moved, scaled, faded, and ro...Chet Haase2010-07-153-38/+974
* | | | | | | | | | | | | | Merge "Remove our copy of the f_mtp.h kernel header, now that it is in bionic."Mike Lockwood2010-07-153-55/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove our copy of the f_mtp.h kernel header, now that it is in bionic.Mike Lockwood2010-07-153-55/+2
* | | | | | | | | | | | | | | am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target.Jeff Brown2010-07-152-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am eb6e0df1: Don\'t build framework tests for simulator target.Jeff Brown2010-07-152-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Don't build framework tests for simulator target.Jeff Brown2010-07-142-0/+10
* | | | | | | | | | | | | | | Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect ...Fabrice Di Meglio2010-07-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \