summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME is ↵satok2012-12-191-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unexpectedly re-enabled * commit '7ad7b2c437d10fb8e7221e6e28aa247217f93681': Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
| * | | | | | | | | | | | | | am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '32b812054cce27d1c70b53ba8ac729c7186b105e': Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
| | * | | | | | | | | | | | | Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7872918 This is a serious issue which the disabled system auxilialy IME is unexpectedly re-enabled by re-building internal IMI cache. Change-Id: I0727cc973dfaea9823194021ce94af8665b98373
* | | | | | | | | | | | | | | am 171a9906: Merge "Update the JNI spec link, and remove a dead link."Elliott Hughes2012-12-192-723/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '171a9906996675e3e9eb49fe3b3c1589417d70fb': Update the JNI spec link, and remove a dead link.
| * | | | | | | | | | | | | | Merge "Update the JNI spec link, and remove a dead link."Elliott Hughes2012-12-182-723/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Update the JNI spec link, and remove a dead link.Elliott Hughes2012-12-182-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 Change-Id: I521b640fdef17c98582171d97214486d16e774e4
* | | | | | | | | | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f44e5d059ca2d6cb1f96ef628cf112ace247f70
| * | | | | | | | | | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge from AOSP staging branchJean-Baptiste Queru2012-12-182-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
| * | | | | | | | | | | | | Merge "Return error upon attempt to use non-existent APN"Robert Greenwalt2012-12-181-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Return error upon attempt to use non-existent APNMikael Hedegren2012-12-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | startUsingNetworkFeature will ignore errors from reconnect - causing ConnectivityService to send faulty information back to requester. Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
| * | | | | | | | | | | | | | Merge "Memory leak due to bad destroy sequence"Adam Powell2012-12-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Memory leak due to bad destroy sequenceJean-Christophe PINCE2012-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the destroy sequence, it happens that the mWebViewClassic was set to null in the transferMessages function and consequently, the call to WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic) is not really removing the view from the watchdog's list; creating a memory leak. Change-Id: I2bae7c8d7c473e2af25e62a485699f88269d6658 Author: Jean-Christophe PINCE <jean-christophe.pince@intel.com> Signed-off-by: Jean-Christophe PINCE <jean-christophe.pince@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 57869
* | | | | | | | | | | | | | | | am c799aee9: am 858eb008: am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK ↵Joe Fernandez2012-12-175-423/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3 * commit 'c799aee9b85062a389e444c0b3009b6f0ad512a2': docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
| * | | | | | | | | | | | | | | am 858eb008: am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release ↵Joe Fernandez2012-12-175-423/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3 * commit '858eb008eb3ea720d9c38346706f4d94bd43f917': docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
| | * | | | | | | | | | | | | | am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to ↵Joe Fernandez2012-12-175-423/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3 * commit '34bdf0abfeaa81b6fe2e8cc95e0ba94893b3e8e8': docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
| | | * | | | | | | | | | | | | docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflictJoe Fernandez2012-12-175-423/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3 Change-Id: I315da053238943a7f77cc30564904bbf0cefed62
* | | | | | | | | | | | | | | | am 81e3c9ed: am d2a21d7f: Merge "Fade recents thumbnail to transparent ↵Jamie Gennis2012-12-171-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | earlier." into jb-mr1.1-dev * commit '81e3c9ed66ce6968a331c4eafb969f66234d6e8a': Fade recents thumbnail to transparent earlier.
| * | | | | | | | | | | | | | | am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into ↵Jamie Gennis2012-12-171-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit 'd2a21d7fee7ba3c9596baf16cadc76dd607a5cb1': Fade recents thumbnail to transparent earlier.
| | * | | | | | | | | | | | | | Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-devJamie Gennis2012-12-171-3/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fade recents thumbnail to transparent earlier.Craig Mautner2012-12-171-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the gpu load by fading the recents thumbnail to an alpha of 0.0 before the remaining animations are completed. When alpha hits 0 the gpu treats the layer as hidden and can merge the remaining layers in time. This is a partial fix for 7729214. Change-Id: I9761bbd0554db6454c7eec0485be798b11672ff5
* | | | | | | | | | | | | | | | | am baca4e5a: am dfb46cea: am 90172e0f: Merge "docs: App Template Tool ↵Joe Fernandez2012-12-1711-66/+450
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation" into jb-mr1-dev * commit 'baca4e5a5d70894ab576c8b4efe6289e709ea8df': docs: App Template Tool documentation
| * | | | | | | | | | | | | | | | am dfb46cea: am 90172e0f: Merge "docs: App Template Tool documentation" into ↵Joe Fernandez2012-12-1711-66/+450
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'dfb46cea6282ac9321b70af6c9a6f6b5396cde2e': docs: App Template Tool documentation
| | * | | | | | | | | | | | | | | am 90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-devJoe Fernandez2012-12-1711-66/+450
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '90172e0f0cb0abfbaa3f1ea0e5251913bd30d828': docs: App Template Tool documentation
| | | * | | | | | | | | | | | | | Merge "docs: App Template Tool documentation" into jb-mr1-devJoe Fernandez2012-12-1711-66/+450
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | docs: App Template Tool documentationJoe Fernandez2012-12-1711-66/+450
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75b8956b808ab21cb744f67c2ce69405dc0a0de4
* | | | | | | | | | | | | | | | | | am d4f4d14a: am 5042b051: am e7c3fba7: Merge "change onEnd() to ↵Robert Ly2012-12-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | withEndAction() in javadocs" into jb-mr1-dev * commit 'd4f4d14a91492384c4553b82be27b5f135a41227': change onEnd() to withEndAction() in javadocs
| * | | | | | | | | | | | | | | | | am 5042b051: am e7c3fba7: Merge "change onEnd() to withEndAction() in ↵Robert Ly2012-12-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javadocs" into jb-mr1-dev * commit '5042b051b395f36d3c582202e9e78758934b79a6': change onEnd() to withEndAction() in javadocs
| | * | | | | | | | | | | | | | | | am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into ↵Robert Ly2012-12-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'e7c3fba7929a1cb73bbe6ca84a5140febc09a62a': change onEnd() to withEndAction() in javadocs
| | | * | | | | | | | | | | | | | Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-devRobert Ly2012-12-171-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | change onEnd() to withEndAction() in javadocsRobert Ly2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic9a04bf86d62249b47dc654052d58797dfc3990c
* | | | | | | | | | | | | | | | | | am 01ec5987: am da013c48: am f347e841: Merge "docs: remove developer survery ↵Scott Main2012-12-174-134/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link" into jb-mr1-dev * commit '01ec5987d11be67f009a9d2eb3aabee95125090a': docs: remove developer survery link
| * | | | | | | | | | | | | | | | | am da013c48: am f347e841: Merge "docs: remove developer survery link" into ↵Scott Main2012-12-174-134/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'da013c48d74aae3c5723eb569ebb324a94db27f2': docs: remove developer survery link
| | * | | | | | | | | | | | | | | | am f347e841: Merge "docs: remove developer survery link" into jb-mr1-devScott Main2012-12-174-134/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f347e841178358b248b5b1abed059079d2ca1ebe': docs: remove developer survery link
| | | * | | | | | | | | | | | | | | Merge "docs: remove developer survery link" into jb-mr1-devScott Main2012-12-174-134/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | docs: remove developer survery linkScott Main2012-12-174-134/+8
| | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f87e53df4f920ace7f8258c6cf0686ad4d8fead
* | | | | | | | | | | | | | | | | | am 4b0ed017: Merge "BackupHelpers: Fix Typo"Christopher Tate2012-12-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b0ed0178de2c9c21bd5514671b8b4282f6a03db': BackupHelpers: Fix Typo
| * | | | | | | | | | | | | | | | | Merge "BackupHelpers: Fix Typo"Christopher Tate2012-12-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | BackupHelpers: Fix TypoYou Kim2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete --> free Change-Id: Idbf7e677f8cc4a9a9d04e58b5cf7d0f1589c5211
* | | | | | | | | | | | | | | | | | | am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from ↵Sascha Prueter2012-12-171-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings app" into jb-mr1.1-dev * commit '25458528f07ef9f4710e669b74b76d687bbc7645': Handle "CODE_ALREADY_PRESENT" message from Settings app
| * | | | | | | | | | | | | | | | | | am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" ↵Sascha Prueter2012-12-171-9/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev * commit 'dd2ed93e4794dd8472593cdd21fb7e0056f11dbf': Handle "CODE_ALREADY_PRESENT" message from Settings app
| | * | | | | | | | | | | | | | | | | Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into ↵Sascha Prueter2012-12-171-9/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | * | | | | | | | | | | | | | | | | Handle "CODE_ALREADY_PRESENT" message from Settings appsatok2012-12-171-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7725834 Change-Id: I85c35e73978d606edf9687e2de76c6ffc3c3ee2b
* | | | | | | | | | | | | | | | | | | | am 5d2de143: am 4664782f: am f93a2941: Merge "docs: update gms auth docs for ↵Robert Ly2012-12-174-88/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 7737187" into jb-mr1-dev * commit '5d2de143883381fb65b026b0975730970e6f33c7': docs: update gms auth docs for bug 7737187
| * | | | | | | | | | | | | | | | | | | am 4664782f: am f93a2941: Merge "docs: update gms auth docs for bug 7737187" ↵Robert Ly2012-12-174-88/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '4664782f88ef1dad1b16a18d51947132d650afeb': docs: update gms auth docs for bug 7737187
| | * | | | | | | | | | | | | | | | | am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-devRobert Ly2012-12-174-88/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / / / | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | * commit 'f93a2941ad8ec72f288669da2426605ad85a98ca': docs: update gms auth docs for bug 7737187
| | | * | | | | | | | | | | | | | | Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-devRobert Ly2012-12-174-88/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | docs: update gms auth docs for bug 7737187Robert Ly2012-12-144-88/+32
| | | | | |_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32c39bbe39ff7d84ea88aeac2ca11a0110700266
* | | | | | | | | | | | | | | | | am 367921dd: (-s ours) Merge "Toast: fix force close if called from system ↵Craig Mautner2012-12-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service" * commit '367921dd879cbc041852b121ce35b3c12803d853': Toast: fix force close if called from system service
| * | | | | | | | | | | | | | | | Merge "Toast: fix force close if called from system service"Craig Mautner2012-12-171-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |