Christopher Tate
e2798f272c
am d9452ecd: Merge "Fix jni registration typo" into gingerbread
...
Merge commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp
* commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405':
Fix jni registration typo
2010-07-15 18:21:33 -07:00
Scott Main
a1989140b9
am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
...
Merge commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f' into gingerbread-plus-aosp
* commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f':
docs: update notepad tutorial to change EditNote activity title and update codelab zip
2010-07-15 18:19:27 -07:00
Christopher Tate
854f9810f1
Merge "Fix jni registration typo" into gingerbread
2010-07-15 18:19:17 -07:00
Scott Main
7ab14f87e7
am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
...
Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread
* commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c':
docs: update notepad tutorial to change EditNote activity title and update codelab zip
2010-07-15 18:17:16 -07:00
Scott Main
9457041ee6
Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
2010-07-15 18:14:16 -07:00
Scott Main
c77f40a3ae
am b8f4a84a: am 80fa5c86: docs: dashboard update
...
Merge commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e' into gingerbread-plus-aosp
* commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e':
docs: dashboard update
2010-07-15 18:14:07 -07:00
Scott Main
3b1d921f94
am 80fa5c86: docs: dashboard update
...
Merge commit '80fa5c866eaf323c39bef4159a351950f0ea527a' into gingerbread
* commit '80fa5c866eaf323c39bef4159a351950f0ea527a':
docs: dashboard update
2010-07-15 18:10:39 -07:00
Katie McCormick
370e004113
am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
...
Merge commit 'a6a134d42df5fde04f2cc379175c756aff333cb3' into gingerbread-plus-aosp
* commit 'a6a134d42df5fde04f2cc379175c756aff333cb3':
Doc change: Update AVD create instructions.
2010-07-15 17:32:04 -07:00
Katie McCormick
1524d11c6d
am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
...
Merge commit '28da8e5e4aefd919064e3c33a311edf1af5a958e' into gingerbread
* commit '28da8e5e4aefd919064e3c33a311edf1af5a958e':
Doc change: Update AVD create instructions.
2010-07-15 17:28:57 -07:00
Katie McCormick
9db8431e87
Merge "Doc change: Update AVD create instructions." into froyo
2010-07-15 17:25:10 -07:00
Jason Sams
99e468a5c9
Merge "1st cut of ForEach and test."
2010-07-15 17:12:10 -07:00
Fred Quintana
55b1e0b5ff
Merge "fix a bug where some accounts changed listeners don't see the new version of the accounts because the accounts changed broadcast is sent from within the transaction try block, thus before db.endTransaction() is called."
2010-07-15 16:35:03 -07:00
Robert Greenwalt
733a2f8ab4
Merge "Fix Emulator boot."
2010-07-15 16:01:25 -07:00
Jaikumar Ganesh
7ff0daafbe
Merge "Handle Input and network signal changes for HID and tethering."
2010-07-15 16:00:02 -07:00
Brad Fitzpatrick
6c3d7ce4f9
am 703e5d3c: StrictMode: avoid an allocation in common case
...
Merge commit '703e5d3c7fbeb8ca0978045db01d40318f838612' into gingerbread-plus-aosp
* commit '703e5d3c7fbeb8ca0978045db01d40318f838612':
StrictMode: avoid an allocation in common case
2010-07-15 15:52:48 -07:00
Brad Fitzpatrick
017823f67e
am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread
...
Merge commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002' into gingerbread-plus-aosp
* commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002':
StrictMode: batch drop box writes for system apps
2010-07-15 15:47:05 -07:00
Brad Fitzpatrick
64bdb3c980
am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
...
Merge commit '1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp
* commit '1772c34e5331a6456c8a93051192d19ff873c062':
StrictMode: gather and return violating stacks in Binder replies
2010-07-15 15:44:46 -07:00
Brad Fitzpatrick
7f7fa79c4e
am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread
...
Merge commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122' into gingerbread-plus-aosp
* commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122':
More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
2010-07-15 15:44:41 -07:00
Brad Fitzpatrick
e5d45f6c74
Merge "StrictMode: batch drop box writes for system apps" into gingerbread
2010-07-15 15:43:03 -07:00
Brad Fitzpatrick
48d2d65320
Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
2010-07-15 15:42:41 -07:00
Brad Fitzpatrick
be581cfa17
Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync." into gingerbread
2010-07-15 15:42:12 -07:00
Alex Sakhartchouk
d72ad79168
Merge "Populate java objects with native data from a3d file. Remove legacy constructor from programraster Make a3d object creation synchronous"
2010-07-15 15:19:07 -07:00
Christopher Tate
083b89a41c
am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread
...
Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp
* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
Add native C APIs for working with the Asset Manager
2010-07-15 15:03:32 -07:00
Christopher Tate
005c212acd
Merge "Add native C APIs for working with the Asset Manager" into gingerbread
2010-07-15 15:00:14 -07:00
Romain Guy
90cafaef56
Merge "Add support for BitmapShader."
2010-07-15 14:45:37 -07:00
James Dong
0d049910d8
am 42ef0c71: Initial check-in for software m4v_h263 encoder
...
Merge commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae' into gingerbread-plus-aosp
* commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae':
Initial check-in for software m4v_h263 encoder
2010-07-15 14:37:33 -07:00
Christopher Tate
9373680116
Add native C APIs for working with the Asset Manager
...
Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
2010-07-15 14:28:21 -07:00
Jim Shuma
0b70a47248
Merge "Making Program*.Builder classes' setters return 'this'"
2010-07-15 13:43:52 -07:00
Robert Greenwalt
3a27f0912b
Merge "Don't cast CONNECTING msgs to CONNECTED."
2010-07-15 13:35:14 -07:00
Brad Fitzpatrick
d36f4a5f13
StrictMode: gather and return violating stacks in Binder replies
...
Now, when Thread A has a strict mode policy in effect and does a
Binder call to Thread B (most likely in another process), the strict
mode policy is passed along, but with the GATHER penalty bit set which
overrides other policies and instead gathers all offending stack
traces to a threadlocal which are then written back in the Parcel's
reply header.
Change-Id: I7d4497032a0609b37b1a2a15855f5c929ba0584d
2010-07-15 13:18:05 -07:00
Brad Fitzpatrick
a877cd85b5
More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
...
Change-Id: Ia67cabcc17a73a0f15907ffea683d06bc41b90e5
2010-07-15 13:18:05 -07:00
Dave Sparks
b8b253799a
Merge "Add some javadoc to AudioRecord, plus updates based on code review comments."
2010-07-15 12:35:52 -07:00
Steve Howard
27c85e04ea
am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
...
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9'
* commit '203ec9fa6eab21621969f36053d4cd59c23977a9':
Interface support for custom HTTP headers in DL manager
2010-07-15 12:31:29 -07:00
Mike Lockwood
9ea8b8ea6d
Merge changes I93364c74,I5ca831b8
...
* changes:
Exclude MTP implementation from simulator build
Fixes for simulator build on lucid
2010-07-15 12:31:08 -07:00
Steve Howard
fd5a8250e9
am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
...
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp
* commit 'd6343c26b8580f61a257a3045bfa124049201116':
Interface support for custom HTTP headers in DL manager
2010-07-15 12:28:39 -07:00
Steve Howard
f568a7480d
Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
2010-07-15 12:24:14 -07:00
Scott Main
164fa377d1
am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
...
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'
* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
docs: lots of additions to the resources docs
2010-07-15 11:54:15 -07:00
James Dong
015fdae70f
am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
...
Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'
* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
Support user-supplied timescales for authoring
2010-07-15 11:54:10 -07:00
Joe Onorato
815fe39328
am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread
...
Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07'
* commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07':
Clean up some style in the makefiles.
2010-07-15 11:54:00 -07:00
Joe Onorato
4894277c72
am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
...
Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe'
* commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe':
The ICU data is no longer compiled directly into the shared library.
2010-07-15 11:53:51 -07:00
Scott Main
69c3a5cddf
am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
...
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp
* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
docs: lots of additions to the resources docs
2010-07-15 11:23:08 -07:00
Scott Main
5e22cd7219
am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
...
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread
* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
docs: lots of additions to the resources docs
2010-07-15 11:20:32 -07:00
James Dong
f0ff0aa6b7
am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
...
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp
* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
Support user-supplied timescales for authoring
2010-07-15 11:18:53 -07:00
Scott Main
a4e25ab1f3
Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
2010-07-15 11:16:32 -07:00
James Dong
13bea64393
Merge "Support user-supplied timescales for authoring" into gingerbread
2010-07-15 11:16:08 -07:00
Joe Onorato
87d49d86d8
am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread
...
Merge commit '562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp
* commit '562124e84d8ae63b614b14ba257680571091ef1f':
Clean up some style in the makefiles.
2010-07-15 11:12:57 -07:00
Joe Onorato
3efa627241
am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
...
Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp
* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
The ICU data is no longer compiled directly into the shared library.
2010-07-15 11:12:53 -07:00
Joe Onorato
3736a71e56
Merge "checkpoint tablet status bar"
2010-07-15 11:09:04 -07:00
Joe Onorato
51b23cda38
Merge "Clean up some style in the makefiles." into gingerbread
2010-07-15 11:08:39 -07:00
Joe Onorato
72f26b73d2
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
2010-07-15 11:08:34 -07:00