drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,326 Commits 1 Branch 0 Tags
Commit Graph

94326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
7f93e7d265 am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit '88fe4ebc0b6e0499f247b5d896778dd72304bf9f':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-21 10:07:24 -08:00
&& repo sync -j8
518edbfa97 cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596 
Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd
 2012-12-20 16:06:55 -08:00
The Android Open Source Project
ac0fd12413 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I47c257db0d5a21fe4f6592924ebd47bd8578d5ea
 2012-12-20 15:46:28 -08:00
Irfan Sheriff
88fe4ebc0b Merge "NsdService: Clear client info after resolution request is serviced." 2012-12-20 14:43:17 -08:00
The Android Automerger
345f7fcfaf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-20 14:31:16 -08:00
Victoria Lease
5ddfa24776 am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 
* commit 'fc56015bd3d86e470fdf3ac8449776809124875e':
  Possible leak in android_emoji_EmojiFactory_newInstance
 2012-12-20 13:47:07 -08:00
You Kim
218a313bb0 StringBlock_nativeCreate: Possible Leak 
osb can be leaked when osb->getError() != NO_ERROR

Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
 2012-12-21 06:19:38 +09:00
Dirk Dougherty
b7f4bf3604 am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit 'f6c71644dce2a93c386a1803a46ca7d99a9ae543':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:55:39 -08:00
Dirk Dougherty
f6c71644dc am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit 'e487e537b0fcc5b9f972c1e247fd1b019150fa05':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:53:16 -08:00
Dirk Dougherty
e487e537b0 am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit '0402b65327aa568c7ea706879d9ddb222436aa87':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:49:22 -08:00
Dirk Dougherty
0402b65327 Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 2012-12-20 12:46:00 -08:00
Dirk Dougherty
0f08867b93 Doc change: point developer landing page featured content to blog post. 
Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3
 2012-12-20 12:40:22 -08:00
Scott Main
d1ecaf399d am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '15423b204d1dfc6ef5632f26166d445bf9cef2f5':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 12:17:33 -08:00
Scott Main
15423b204d am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '226e973f3946778078840db46274a2c34b30a6b0':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 12:15:25 -08:00
Scott Main
226e973f39 am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '8afb3ba4dac2f3e42884cb40f8fa407e072382e3':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 12:12:03 -08:00
Victoria Lease
fc56015bd3 Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 2012-12-20 12:09:48 -08:00
Scott Main
0aa3df583f am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit 'c3261bd8402b13c4c4ac8842ff7eaa51a9c8c33e':
  docs: NDK r8d Release Notes
 2012-12-20 12:09:13 -08:00
Scott Main
c3261bd840 am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '76f7774db8e8cba1ad06018f42edf21b8c77131c':
  docs: NDK r8d Release Notes
 2012-12-20 12:07:58 -08:00
Scott Main
76f7774db8 am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit 'f6e551239017745f88893acaf38b3bac097aceb1':
  docs: NDK r8d Release Notes
 2012-12-20 12:04:57 -08:00
Scott Main
8afb3ba4da Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 2012-12-20 12:03:53 -08:00
Scott Main
f6e5512390 Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 2012-12-20 12:02:29 -08:00
Andrew Hsieh
38dd88ef6c am 62ec9588: Merge "Fix typo" 
* commit '62ec9588650327f4fc3f367097b9549635229239':
  Fix typo
 2012-12-20 11:03:46 -08:00
Glenn Kasten
2326be4fa9 am ba97ad2a: Merge "Leak in ToneGenerator_native_setup" 
* commit 'ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf':
  Leak in ToneGenerator_native_setup
 2012-12-20 11:03:33 -08:00
Dirk Dougherty
0943862cf5 am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit 'edafbe798e7daf18a109fa234b11fe2351c8fe27':
  Doc change: update develop landing page.
 2012-12-20 09:41:02 -08:00
Dirk Dougherty
edafbe798e am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit 'a232fa3f831a9ae104c492d321be580ea0c7770e':
  Doc change: update develop landing page.
 2012-12-20 09:38:56 -08:00
Dirk Dougherty
a232fa3f83 am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit '0f0d9b32cb41acc2e7b0b5556c64b366f5f08709':
  Doc change: update develop landing page.
 2012-12-20 09:34:47 -08:00
Dirk Dougherty
0f0d9b32cb Merge "Doc change: update develop landing page." into jb-mr1-dev 2012-12-20 09:28:37 -08:00
Scott Main
f36ced0a8c am a6cf72d8: am 18ac5570: am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 
* commit 'a6cf72d8ce00b27f00c59ccd34b775cdaf92341e':
  Doc change: add mention of localized promo graphics.
 2012-12-19 16:21:38 -08:00
Scott Main
a6cf72d8ce am 18ac5570: am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 
* commit '18ac55709de6714459c89086b6924bb697470999':
  Doc change: add mention of localized promo graphics.
 2012-12-19 16:19:11 -08:00
Scott Main
18ac55709d am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 
* commit 'db49d317291861d8f885f3510f9b70b31e592f11':
  Doc change: add mention of localized promo graphics.
 2012-12-19 16:15:08 -08:00
Scott Main
db49d31729 Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev 2012-12-19 16:12:18 -08:00
Andrew Hsieh
62ec958865 Merge "Fix typo" 2012-12-19 16:10:12 -08:00
The Android Open Source Project
e25bb3c44f Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I1bfd455eca23e774d85c3af0ae06d8005218ddbb
 2012-12-19 13:58:55 -08:00
The Android Automerger
2d6ed407a7 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-19 13:51:03 -08:00
Justin Koh
a90c92a1c9 am 86903699: Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev 
* commit '86903699692a0b3229062da2995d829629e64e7b':
  Start RecognitionActivity with an upswipe gesture.
 2012-12-19 11:46:34 -08:00
Justin Koh
8690369969 Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev 2012-12-19 11:42:26 -08:00
Elliott Hughes
c4241766be am 6f59fb53: am 71fc6b86: am 84303f5c: Update the JNI spec link, and remove a dead link. 
* commit '6f59fb53acebd7bf09372f17514322e076874f89':
  Update the JNI spec link, and remove a dead link.
 2012-12-19 11:21:16 -08:00
Elliott Hughes
6f59fb53ac am 71fc6b86: am 84303f5c: Update the JNI spec link, and remove a dead link. 
* commit '71fc6b860c77b36435a6f221919531582866e787':
  Update the JNI spec link, and remove a dead link.
 2012-12-19 11:19:28 -08:00
Elliott Hughes
71fc6b860c am 84303f5c: Update the JNI spec link, and remove a dead link. 
* commit '84303f5cd613f24653cc08d156a533e23a76b34a':
  Update the JNI spec link, and remove a dead link.
 2012-12-19 11:15:17 -08:00
Elliott Hughes
84303f5cd6 Update the JNI spec link, and remove a dead link. 
Also remove the duplicate copy of this file. There's a redirect in place
from the old location.

Bug: http://code.google.com/p/android/issues/detail?id=41623

(cherry picked from commit 965da34de94cdb845b64bd676e45b260000cd09d)

Change-Id: I5a940383fb27900ba560822c060cc5ed864eb771
 2012-12-19 11:09:16 -08:00
Joe Malin
44a0489f59 am 46dd710a: am 89523cfe: am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit '46dd710a802e016740711e40ecfac345e19a183f':
  Android Training: Multiple Threads
 2012-12-19 10:43:14 -08:00
Joe Malin
46dd710a80 am 89523cfe: am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit '89523cfe92c7975324894d21d8c1624b4ff7b9a4':
  Android Training: Multiple Threads
 2012-12-19 10:40:39 -08:00
Joe Malin
89523cfe92 am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit '4c59230a2fe0ec750b31a0908fbee5c5613b87c0':
  Android Training: Multiple Threads
 2012-12-19 10:37:41 -08:00
Joe Malin
4c59230a2f am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit 'd4289c6e20c0a42deba796d02b5a9bc60c9a4e7c':
  Android Training: Multiple Threads
 2012-12-19 10:35:32 -08:00
Joe Malin
d4289c6e20 am c84b3603: am 8dd6275e: Android Training: Multiple Threads 
* commit 'c84b3603fa27db68516187cea19de1e6a021152d':
  Android Training: Multiple Threads
 2012-12-19 10:33:14 -08:00
Joe Malin
c84b3603fa am 8dd6275e: Android Training: Multiple Threads 
* commit '8dd6275e2871bea1acb20cbdd98ea0451b3d5be0':
  Android Training: Multiple Threads
 2012-12-19 10:31:39 -08:00
satok
5ce0226708 am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabled 
* commit '7ad7b2c437d10fb8e7221e6e28aa247217f93681':
  Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
 2012-12-19 10:24:45 -08:00
satok
7ad7b2c437 am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabled 
* commit '32b812054cce27d1c70b53ba8ac729c7186b105e':
  Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
 2012-12-19 10:23:04 -08:00
Joe Malin
8dd6275e28 Android Training: Multiple Threads 
Change-Id: I58c472aa5ed82f6b4fb50d9bbb4e66841b9e99c3
 2012-12-19 09:47:04 -08:00
Elliott Hughes
a8d7b52c88 am 171a9906: Merge "Update the JNI spec link, and remove a dead link." 
* commit '171a9906996675e3e9eb49fe3b3c1589417d70fb':
  Update the JNI spec link, and remove a dead link.
 2012-12-19 09:46:36 -08:00