summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance"Victoria Lease2012-12-201-9/+5
|\ | | | | | | | | * commit 'fc56015bd3d86e470fdf3ac8449776809124875e': Possible leak in android_emoji_EmojiFactory_newInstance
| * Merge "Possible leak in android_emoji_EmojiFactory_newInstance"Victoria Lease2012-12-201-9/+5
| |\
| | * Possible leak in android_emoji_EmojiFactory_newInstanceYou Kim2012-12-121-9/+5
| | | | | | | | | | | | | | | | | | | | | jchars is not released correctly if factory is NULL. In addition, unnecessary string conversion removed. Change-Id: I3ea58391dfe7a96ea6d6ae61bb0867a2d8d49fb0
* | | am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer ↵Dirk Dougherty2012-12-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | landing page featured content to blog post." into jb-mr1-dev * commit 'f6c71644dce2a93c386a1803a46ca7d99a9ae543': Doc change: point developer landing page featured content to blog post.
| * \ \ am e487e537: am 0402b653: Merge "Doc change: point developer landing page ↵Dirk Dougherty2012-12-201-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | featured content to blog post." into jb-mr1-dev * commit 'e487e537b0fcc5b9f972c1e247fd1b019150fa05': Doc change: point developer landing page featured content to blog post.
| | * \ \ am 0402b653: Merge "Doc change: point developer landing page featured ↵Dirk Dougherty2012-12-201-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content to blog post." into jb-mr1-dev * commit '0402b65327aa568c7ea706879d9ddb222436aa87': Doc change: point developer landing page featured content to blog post.
| | | * \ \ Merge "Doc change: point developer landing page featured content to blog ↵Dirk Dougherty2012-12-201-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | post." into jb-mr1-dev
| | | | * | | Doc change: point developer landing page featured content to blog post.Dirk Dougherty2012-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3
* | | | | | | am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release ↵Scott Main2012-12-204-29/+251
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes" into jb-mr1-dev * commit '15423b204d1dfc6ef5632f26166d445bf9cef2f5': docs: SDK r21.0.1 Release Notes
| * | | | | | am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into ↵Scott Main2012-12-204-29/+251
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '226e973f3946778078840db46274a2c34b30a6b0': docs: SDK r21.0.1 Release Notes
| | * | | | | am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-devScott Main2012-12-204-29/+251
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '8afb3ba4dac2f3e42884cb40f8fa407e072382e3': docs: SDK r21.0.1 Release Notes
| | | * | | | Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-devScott Main2012-12-204-29/+251
| | | |\ \ \ \
| | | | * | | | docs: SDK r21.0.1 Release NotesJoe Fernandez2012-12-174-37/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d3a5d29fd38d085b13b424ff6ab071925a5a261
* | | | | | | | am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" ↵Scott Main2012-12-201-10/+173
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'c3261bd8402b13c4c4ac8842ff7eaa51a9c8c33e': docs: NDK r8d Release Notes
| * | | | | | | am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-devScott Main2012-12-201-10/+173
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '76f7774db8e8cba1ad06018f42edf21b8c77131c': docs: NDK r8d Release Notes
| | * | | | | | am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-devScott Main2012-12-201-10/+173
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6e551239017745f88893acaf38b3bac097aceb1': docs: NDK r8d Release Notes
| | | * | | | | Merge "docs: NDK r8d Release Notes" into jb-mr1-devScott Main2012-12-201-10/+173
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | docs: NDK r8d Release NotesJoe Fernandez2012-12-171-10/+173
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I93aba7b95b2e6a69a7cd3aca605470d568f1ecd1
* | | | | | | am 62ec9588: Merge "Fix typo"Andrew Hsieh2012-12-203-11/+11
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | * commit '62ec9588650327f4fc3f367097b9549635229239': Fix typo
| * | | | | | Merge "Fix typo"Andrew Hsieh2012-12-193-11/+11
| |\ \ \ \ \ \
| | * | | | | | Fix typoAndrew Hsieh2012-12-193-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58f863c4eb1eb4196d001c280027ab59bee51ce4
* | | | | | | | am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"Glenn Kasten2012-12-201-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf': Leak in ToneGenerator_native_setup
| * | | | | | | Merge "Leak in ToneGenerator_native_setup"Glenn Kasten2012-12-191-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Leak in ToneGenerator_native_setupYou Kim2012-12-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failure in ToneGenerator::isInit causes a leak. lpToneGen should be deleted. Change-Id: I48df7a328fed01be8412d5449ee0753dad3c101f
* | | | | | | | | am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop ↵Dirk Dougherty2012-12-202-16/+16
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | landing page." into jb-mr1-dev * commit 'edafbe798e7daf18a109fa234b11fe2351c8fe27': Doc change: update develop landing page.
| * | | | | | | | am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." ↵Dirk Dougherty2012-12-202-16/+16
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'a232fa3f831a9ae104c492d321be580ea0c7770e': Doc change: update develop landing page.
| | * | | | | | | am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-devDirk Dougherty2012-12-202-16/+16
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '0f0d9b32cb41acc2e7b0b5556c64b366f5f08709': Doc change: update develop landing page.
| | | * | | | | | Merge "Doc change: update develop landing page." into jb-mr1-devDirk Dougherty2012-12-202-16/+16
| | | |\ \ \ \ \ \
| | | | * | | | | | Doc change: update develop landing page.Dirk Dougherty2012-12-172-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I591cf8bb592053c0e397cf8eb2f827ca454d9f13
* | | | | | | | | | am a6cf72d8: am 18ac5570: am db49d317: Merge "Doc change: add mention of ↵Scott Main2012-12-192-10/+57
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | localized promo graphics." into jb-mr1-dev * commit 'a6cf72d8ce00b27f00c59ccd34b775cdaf92341e': Doc change: add mention of localized promo graphics.
| * | | | | | | | | am 18ac5570: am db49d317: Merge "Doc change: add mention of localized promo ↵Scott Main2012-12-192-10/+57
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | graphics." into jb-mr1-dev * commit '18ac55709de6714459c89086b6924bb697470999': Doc change: add mention of localized promo graphics.
| | * | | | | | | | am db49d317: Merge "Doc change: add mention of localized promo graphics." ↵Scott Main2012-12-192-10/+57
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'db49d317291861d8f885f3510f9b70b31e592f11': Doc change: add mention of localized promo graphics.
| | | * | | | | | | Merge "Doc change: add mention of localized promo graphics." into jb-mr1-devScott Main2012-12-192-10/+57
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Doc change: add mention of localized promo graphics.Dirk Dougherty2012-12-172-10/+57
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41e583a4d214321633aa39ba235d5777b7e77586
* | | | | | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-190-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bfd455eca23e774d85c3af0ae06d8005218ddbb
| * \ \ \ \ \ \ \ \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | am 86903699: Merge "Start RecognitionActivity with an upswipe gesture." into ↵Justin Koh2012-12-193-32/+27
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-aah-dev * commit '86903699692a0b3229062da2995d829629e64e7b': Start RecognitionActivity with an upswipe gesture.
| * | | | | | | | | | Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-devJustin Koh2012-12-193-32/+27
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Start RecognitionActivity with an upswipe gesture.Ben Pietrzak2012-12-183-32/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7dd91bef3eb551bb7617307cc9a4777226b5ded7
* | | | | | | | | | | | am 6f59fb53: am 71fc6b86: am 84303f5c: Update the JNI spec link, and remove ↵Elliott Hughes2012-12-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a dead link. * commit '6f59fb53acebd7bf09372f17514322e076874f89': Update the JNI spec link, and remove a dead link.
| * | | | | | | | | | | am 71fc6b86: am 84303f5c: Update the JNI spec link, and remove a dead link.Elliott Hughes2012-12-192-723/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '71fc6b860c77b36435a6f221919531582866e787': Update the JNI spec link, and remove a dead link.
| | * | | | | | | | | | am 84303f5c: Update the JNI spec link, and remove a dead link.Elliott Hughes2012-12-192-723/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '84303f5cd613f24653cc08d156a533e23a76b34a': Update the JNI spec link, and remove a dead link.
| | | * | | | | | | | | Update the JNI spec link, and remove a dead link.Elliott Hughes2012-12-192-723/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | am 46dd710a: am 89523cfe: am 4c59230a: am d4289c6e: am c84b3603: am ↵Joe Malin2012-12-197-0/+869
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dd6275e: Android Training: Multiple Threads * commit '46dd710a802e016740711e40ecfac345e19a183f': Android Training: Multiple Threads
| * | | | | | | | | | | am 89523cfe: am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android ↵Joe Malin2012-12-197-0/+869
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Training: Multiple Threads * commit '89523cfe92c7975324894d21d8c1624b4ff7b9a4': Android Training: Multiple Threads
| | * | | | | | | | | | am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: ↵Joe Malin2012-12-197-0/+869
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple Threads * commit '4c59230a2fe0ec750b31a0908fbee5c5613b87c0': Android Training: Multiple Threads
| | | * | | | | | | | | am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple ThreadsJoe Malin2012-12-197-0/+869
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4289c6e20c0a42deba796d02b5a9bc60c9a4e7c': Android Training: Multiple Threads
| | | | * \ \ \ \ \ \ \ \ am c84b3603: am 8dd6275e: Android Training: Multiple ThreadsJoe Malin2012-12-197-0/+869
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c84b3603fa27db68516187cea19de1e6a021152d': Android Training: Multiple Threads
| | | | | * \ \ \ \ \ \ \ \ am 8dd6275e: Android Training: Multiple ThreadsJoe Malin2012-12-197-0/+869
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8dd6275e2871bea1acb20cbdd98ea0451b3d5be0': Android Training: Multiple Threads
| | | | | | * | | | | | | | | Android Training: Multiple ThreadsJoe Malin2012-12-197-0/+869
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58c472aa5ed82f6b4fb50d9bbb4e66841b9e99c3
generated by cgit v1.1 at 2025-04-02 19:40:53 +0000