git.osdn.net Git - android-x86/frameworks-base.git/log

Dongwon Kang [Tue, 9 Dec 2014 00:17:28 +0000 (00:17 +0000)]

am 6077acaf: am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev

* commit '6077acaf14899fc6dacb4bd73337e4a22b5e2b01':
TIF: handle a race condition when a session is crashed

commit | commitdiff | tree

Dongwon Kang [Tue, 9 Dec 2014 00:17:23 +0000 (00:17 +0000)]

am 46e18c1d: am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev

* commit '46e18c1d4159e1d34197d756e5df6a3d2e60ad04':
TIF: increase the time threshold for tune operation which was too harsh

commit | commitdiff | tree

Filip Gruszczynski [Tue, 9 Dec 2014 00:17:18 +0000 (00:17 +0000)]

am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev

* commit '5ae61a811afca4fa7ddca1e4693f0b84fd09a6dc':
Private Window flag to disable touch events in WallpaperService.

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 9 Dec 2014 00:17:14 +0000 (00:17 +0000)]

am e2c8b5ba: am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs

* commit 'e2c8b5ba1cb39533464f52bda3ee59334737014d':
Revert "docs: Long press to dismiss fix by Wayne"

commit | commitdiff | tree

Raph Levien [Tue, 9 Dec 2014 00:17:09 +0000 (00:17 +0000)]

am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev

* commit '1918d0276ad502e45944bd75a187dd22021790c5':
Change Linkify leniency to VALID

commit | commitdiff | tree

Nancy Chen [Tue, 9 Dec 2014 00:17:04 +0000 (00:17 +0000)]

am 8940955a: am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev

* commit '8940955a0878b777309e5171ad899562d3c58406':
Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)

commit | commitdiff | tree

Dianne Hackborn [Tue, 9 Dec 2014 00:16:59 +0000 (00:16 +0000)]

am 34e7003a: am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev

* commit '34e7003a78005e86326c86345561e986978723c6':
Fix issue #18593636: Turn on "kill important processes that...

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:16:54 +0000 (00:16 +0000)]

am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs

* commit '5f5e13d07fcf7531c0bb61f147732a430ad5aeda':
Avoid extra saveLayer calls in RippleDrawable, fix docs

commit | commitdiff | tree

Svetoslav [Tue, 9 Dec 2014 00:16:48 +0000 (00:16 +0000)]

am f477aeb3: am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.

* commit 'f477aeb367f05a64a03ed09efc9e0a9d6f9a6ec2':
Ensure all events from a showing window are dispatched.

commit | commitdiff | tree

Lajos Molnar [Tue, 9 Dec 2014 00:16:43 +0000 (00:16 +0000)]

am 967da505: am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev

* commit '967da505b2cb96ed85161fd940dbecb467bfe38c':
media: allow full range of Vorbis sampling rates

commit | commitdiff | tree

Jinsuk Kim [Tue, 9 Dec 2014 00:16:37 +0000 (00:16 +0000)]

am 3f771d87: am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev

* commit '3f771d879cb75a4d8e3b1a2d98f02f76c16cccd1':
CEC: Introduce the retry for commands on the new device discovery.

commit | commitdiff | tree

Dianne Hackborn [Tue, 9 Dec 2014 00:16:31 +0000 (00:16 +0000)]

am 7039f6b4: am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev

* commit '7039f6b423d2795eea6bebc932c9cb0d8422de88':
Add test for isolated services.

commit | commitdiff | tree

Nick Chalko [Tue, 9 Dec 2014 00:16:25 +0000 (00:16 +0000)]

am b7459df4: am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev

* commit 'b7459df472d74d1a1e6ba46b4a72409f984ebd98':
docs: Fix typo, use --> user

commit | commitdiff | tree

Chet Haase [Tue, 9 Dec 2014 00:16:20 +0000 (00:16 +0000)]

am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev

* commit '0a8cc945ce92263ae8b66db7d08c224865b34470':
Fix seeking behavior

commit | commitdiff | tree

Joe Fernandez [Tue, 9 Dec 2014 00:16:15 +0000 (00:16 +0000)]

am 29fb654e: am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs

* commit '29fb654ee95a4c11c8db70c7c9c6133a161672f2':
docs: Fixes for App Indexing training class

commit | commitdiff | tree

Luan Nguyen [Tue, 9 Dec 2014 00:16:11 +0000 (00:16 +0000)]

am 4d1b8b6c: am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs

* commit '4d1b8b6c290973c3f58dd9eb1e164fa8b08d93c0':
docs: Update MessageAPI notes to mention the unreliable transmission nature.

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 00:16:06 +0000 (00:16 +0000)]

am 1bef46b9: am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs

* commit '1bef46b9b3118f4fd204e3f9ff534f36cb27a706':
update L Preview message and disallow crawling /preview

commit | commitdiff | tree

Zhentao Sun [Tue, 9 Dec 2014 00:16:01 +0000 (00:16 +0000)]

am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev

* commit 'b97782f2dac9714e4b6037a6d82a259f32816a5a':
Fixed a leak in GeofenceHardwareImpl.java.

commit | commitdiff | tree

Raph Levien [Mon, 8 Dec 2014 21:46:15 +0000 (13:46 -0800)]

resolved conflicts for merge of b9d21d62 to master

Change-Id: I2936c2a47290c3ea0fc66d460215f9e75d17ebf2

commit | commitdiff | tree

Jason Monk [Mon, 8 Dec 2014 20:29:25 +0000 (20:29 +0000)]

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

commit | commitdiff | tree

Jason Monk [Mon, 8 Dec 2014 20:29:16 +0000 (20:29 +0000)]

am 0538e675: am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev

* commit '0538e675db393777ca1090725b71d54d78fce007':
Make CarrierText handle multi-sim

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 20:29:11 +0000 (20:29 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 20:14:50 +0000 (12:14 -0800)]

Import translations. DO NOT MERGE

Change-Id: I53629d1cb87f02a6602c5b311fa7cea218745da2
Auto-generated-cl: translation import

commit | commitdiff | tree

Dongwon Kang [Mon, 8 Dec 2014 19:14:20 +0000 (19:14 +0000)]

am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev

* commit 'bfc9739b1c1d57f388a8be62e99f3592f08ad9b3':
TIF: handle a race condition when a session is crashed

commit | commitdiff | tree

Dongwon Kang [Mon, 8 Dec 2014 19:14:14 +0000 (19:14 +0000)]

am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev

* commit '91d6f185d3c9109ed21956df7d8fd9501ccf1f6c':
TIF: increase the time threshold for tune operation which was too harsh

commit | commitdiff | tree

Filip Gruszczynski [Mon, 8 Dec 2014 19:13:39 +0000 (19:13 +0000)]

am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev

* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
Private Window flag to disable touch events in WallpaperService.

commit | commitdiff | tree

Ricardo Cervera-Navarro [Mon, 8 Dec 2014 19:13:33 +0000 (19:13 +0000)]

am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs

* commit '2ca0f49d7e9820699a022135101953313d666d0f':
Revert "docs: Long press to dismiss fix by Wayne"

commit | commitdiff | tree

Raph Levien [Mon, 8 Dec 2014 19:13:14 +0000 (19:13 +0000)]

am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev

* commit '8aa97d26e48cb86398e3f7df8103379564f16082':
Change Linkify leniency to VALID

commit | commitdiff | tree

Nancy Chen [Mon, 8 Dec 2014 19:13:06 +0000 (19:13 +0000)]

am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev

* commit '859fba1def4ed680cfbd189621c1ae557c2cab9a':
Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)

commit | commitdiff | tree

Dianne Hackborn [Mon, 8 Dec 2014 19:12:47 +0000 (19:12 +0000)]

am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev

* commit '3cb6496b6c8bb48d458c46e7a062228f0488307d':
Fix issue #18593636: Turn on "kill important processes that...

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 19:12:32 +0000 (19:12 +0000)]

am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs

* commit '108e539495edb2bfc0d1a3a2cb0879583561bed6':
Avoid extra saveLayer calls in RippleDrawable, fix docs

commit | commitdiff | tree

Svetoslav [Mon, 8 Dec 2014 19:12:22 +0000 (19:12 +0000)]

am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.

* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
Ensure all events from a showing window are dispatched.

commit | commitdiff | tree

Lajos Molnar [Mon, 8 Dec 2014 19:12:07 +0000 (19:12 +0000)]

am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev

* commit '2b6dc199432a574d8655734865b0d75d2140fd8c':
media: allow full range of Vorbis sampling rates

commit | commitdiff | tree

Jinsuk Kim [Mon, 8 Dec 2014 19:11:58 +0000 (19:11 +0000)]

am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev

* commit 'd1133ba8855199b34c22b369f34c987a14c68b85':
CEC: Introduce the retry for commands on the new device discovery.

commit | commitdiff | tree

Dianne Hackborn [Mon, 8 Dec 2014 19:11:51 +0000 (19:11 +0000)]

am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev

* commit '7ca6cc75e32437594bfa53c6f2ca14156c44eb17':
Add test for isolated services.

commit | commitdiff | tree

Nick Chalko [Mon, 8 Dec 2014 19:11:45 +0000 (19:11 +0000)]

am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev

* commit '4d1e20a24765711c2767cbab0a7077ca538c838e':
docs: Fix typo, use --> user

commit | commitdiff | tree

Chet Haase [Mon, 8 Dec 2014 19:11:33 +0000 (19:11 +0000)]

am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev

* commit 'b29c6299704ffd3885be6347bf85058010e24868':
Fix seeking behavior

commit | commitdiff | tree

Joe Fernandez [Mon, 8 Dec 2014 19:10:07 +0000 (19:10 +0000)]

am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs

* commit 'f6b890e448e369c506c0ed57a336ce3f6429b940':
docs: Fixes for App Indexing training class

commit | commitdiff | tree

Luan Nguyen [Mon, 8 Dec 2014 19:09:59 +0000 (19:09 +0000)]

am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs

* commit '37579034a14d6442f0765e45b571a20dbcdcb83e':
docs: Update MessageAPI notes to mention the unreliable transmission nature.

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:09:53 +0000 (19:09 +0000)]

am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs

* commit 'a0ce71166198a6ebf337b7e2439a3db79b7d9ad6':
update L Preview message and disallow crawling /preview

commit | commitdiff | tree

Zhentao Sun [Mon, 8 Dec 2014 19:09:36 +0000 (19:09 +0000)]

am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev

* commit '4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
Fixed a leak in GeofenceHardwareImpl.java.

commit | commitdiff | tree

Raph Levien [Mon, 8 Dec 2014 19:09:18 +0000 (19:09 +0000)]

am 8de4fb2f: am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev

* commit '8de4fb2fe53ed7707500d9cdf737953bed3dec7e':
Fix off-by-one error in computeEllipsis

commit | commitdiff | tree

Jason Monk [Mon, 8 Dec 2014 19:09:10 +0000 (19:09 +0000)]

am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev

* commit '85d61aaa1a441efd1c1eba2e30742552fa34a0d6':
Make CarrierText handle multi-sim

commit | commitdiff | tree

Mike Lockwood [Mon, 8 Dec 2014 18:46:35 +0000 (18:46 +0000)]

Merge "MIDI Manager work in progress"

commit | commitdiff | tree

Mike Lockwood [Mon, 1 Dec 2014 21:54:59 +0000 (13:54 -0800)]

MIDI Manager work in progress

Still to do:

Add MidiInputPort and MidiOutputPort classes
Schedule sending MIDI events in the future
Security/permissions
Reconsider interface for virtual devices
Look into performance optimizations

Change-Id: I9b7d63b196996a04be0a830efa913043da1328a8

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 15:06:02 +0000 (07:06 -0800)]

Import translations. DO NOT MERGE

Change-Id: I8c505596a581cd34249251e9c5b040eefd049bb4
Auto-generated-cl: translation import

commit | commitdiff | tree

Joe Fernandez [Sat, 6 Dec 2014 06:40:58 +0000 (06:40 +0000)]

Merge "docs:build system updates"

commit | commitdiff | tree

Rich Slogar [Fri, 7 Nov 2014 01:15:28 +0000 (17:15 -0800)]

docs:build system updates

Change-Id: I8a5810824cbef3bb81173d80827075d3754d7573

commit | commitdiff | tree

smain@google.com [Sat, 6 Dec 2014 04:29:42 +0000 (20:29 -0800)]

fix migrate guide and other studio edits

Change-Id: Ic223d8fa3cd1e66ddd37b8f896fef12869be4268

commit | commitdiff | tree

smain@google.com [Sat, 6 Dec 2014 04:10:44 +0000 (04:10 +0000)]

Merge "docs:sdk installing file update"

commit | commitdiff | tree

smain@google.com [Sat, 6 Dec 2014 04:02:14 +0000 (20:02 -0800)]

docs:sdk installing file update

Change-Id: Iea016bb42df95d19058f261f581482ecc4b8b3b4

commit | commitdiff | tree

Joe Fernandez [Sat, 6 Dec 2014 03:58:32 +0000 (03:58 +0000)]

Merge "docs:building your first app"

commit | commitdiff | tree

smain@google.com [Sat, 6 Dec 2014 00:43:15 +0000 (16:43 -0800)]

update studio hero image and add section about code editor

Change-Id: Ifd9c5b22139b3ded42c3dab31e9946c40c4f0b38

commit | commitdiff | tree

Rich Slogar [Sat, 6 Dec 2014 03:39:09 +0000 (19:39 -0800)]

docs:building your first app

Change-Id: I3d810d0043be59a1eecfac7c02631542e9408f01

commit | commitdiff | tree

smain@google.com [Sat, 6 Dec 2014 02:16:30 +0000 (18:16 -0800)]

docs: project updates

Change-Id: If85a51cf2f46a8619798804e880e02f99d1e4ee3

commit | commitdiff | tree

smain@google.com [Fri, 5 Dec 2014 23:00:19 +0000 (23:00 +0000)]

Merge "docs: setup-virtual-device"

commit | commitdiff | tree

smain@google.com [Fri, 5 Dec 2014 19:26:00 +0000 (11:26 -0800)]

docs: setup-virtual-device

Change-Id: I7c49f97c6ebbf64fb642dc24698e172361e5694f

commit | commitdiff | tree

Joe Fernandez [Fri, 5 Dec 2014 22:50:24 +0000 (22:50 +0000)]

Merge "docs: publishing with studio"

commit | commitdiff | tree

Alan Viverette [Fri, 5 Dec 2014 21:49:36 +0000 (21:49 +0000)]

am 23d86231: am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev

* commit '23d86231e9af2f4ba43cbc8a8cbbfc9757a98ddc':
Update locally cached drawables when constant state changes

commit | commitdiff | tree

Wale Ogunwale [Fri, 5 Dec 2014 21:49:31 +0000 (21:49 +0000)]

am af3361bb: am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev

* commit 'af3361bb264d9d037f0bd10532a752bbaeaec39c':
Add support from restoring recent's backup.

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:49:11 +0000 (21:49 +0000)]

am c67d8958: am 3f11bba5: am afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev

* commit 'c67d89588c17fc94b7b9088eb60f311b5dbf31ac':
bug fix possible NPE while startProcessLocked()

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:49:07 +0000 (21:49 +0000)]

am 637e4cb4: am b97b19f6: am 9052862e: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev

* commit '637e4cb4b3946e4fc4c15734fbf18c380867e5bc':
[ActivityManager] Invalidate last screenshot when activity relaunched

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:49:02 +0000 (21:49 +0000)]

am a6e99486: am f6d03f39: am 799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev

* commit 'a6e99486b1ceddb0873cdc46e8baf9ce55f972a7':
[ActivityManager] Fix race condition in pss collection

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:48:58 +0000 (21:48 +0000)]

am f128225f: am a32933fd: am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev

* commit 'f128225f93acb9479451d2806fe4d2e981fe34fd':
ANR caused by incorrect cleanup in BroadcastQueue.

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:48:54 +0000 (21:48 +0000)]

am 7978f60b: am 95cce9d5: am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev

* commit '7978f60b9e950053caad4823dbc4258192480905':
Avoid system server crash due to package removed

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:48:50 +0000 (21:48 +0000)]

am 655dd3eb: am 435496e1: am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev

* commit '655dd3eb171d7b42678529a9c5a2075ab89a1698':
Reset killedByAm flag at attachApplicationLocked

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:48:45 +0000 (21:48 +0000)]

am 00454026: am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev

* commit '004540260c02222fe2c611823c428e02b4a8a135':
[ActivityManager] Fix NPE when start activity

commit | commitdiff | tree

Alan Viverette [Fri, 5 Dec 2014 21:41:10 +0000 (21:41 +0000)]

am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev

* commit 'ae656af727966df132d5ec7a462bc8bd98e41b71':
Update locally cached drawables when constant state changes

commit | commitdiff | tree

Wale Ogunwale [Fri, 5 Dec 2014 21:41:03 +0000 (21:41 +0000)]

am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev

* commit '9a3f6ac63c9c11008b6dbb99d5213b3d3f51fca0':
Add support from restoring recent's backup.

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:40:55 +0000 (21:40 +0000)]

am 3f11bba5: am afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev

* commit '3f11bba5b90b9b0098f23f08a97e3dfc1421db33':
bug fix possible NPE while startProcessLocked()

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:40:49 +0000 (21:40 +0000)]

am b97b19f6: am 9052862e: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev

* commit 'b97b19f6a46fe3388373f2215446363e64e799c1':
[ActivityManager] Invalidate last screenshot when activity relaunched

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:40:43 +0000 (21:40 +0000)]

am f6d03f39: am 799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev

* commit 'f6d03f398098bdff74bcc7442fbc1912536a33e2':
[ActivityManager] Fix race condition in pss collection

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:40:37 +0000 (21:40 +0000)]

am a32933fd: am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev

* commit 'a32933fdfe5909de63b938b65ec0d74297d0800d':
ANR caused by incorrect cleanup in BroadcastQueue.

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:40:32 +0000 (21:40 +0000)]

am 95cce9d5: am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev

* commit '95cce9d57e627a86f612bf402b3338a6a1a1eae3':
Avoid system server crash due to package removed

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:40:26 +0000 (21:40 +0000)]

am 435496e1: am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev

* commit '435496e1ac4d3e9d1381619ae54f6812c6a8ed0d':
Reset killedByAm flag at attachApplicationLocked

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:40:21 +0000 (21:40 +0000)]

am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev

* commit '1d8b27bceddcd2ff26bc0f2b8d7a5f7a54604b06':
[ActivityManager] Fix NPE when start activity

commit | commitdiff | tree

Rich Slogar [Fri, 7 Nov 2014 23:17:36 +0000 (15:17 -0800)]

docs: publishing with studio

Change-Id: I56ecbd655747c6a9def323eade7b21bb0d46aeb2

commit | commitdiff | tree

David Friedman [Fri, 5 Dec 2014 21:20:37 +0000 (21:20 +0000)]

am 278fd97a: am 753f4fc9: am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs

* commit '278fd97a001b9c0334a05b13663dcec55e383c21':
Change notes for NDK r10d, to publish to DAC

commit | commitdiff | tree

Geoff Mendal [Fri, 5 Dec 2014 21:20:33 +0000 (21:20 +0000)]

am cf6821a9: (-s ours) am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'cf6821a94227d665ba8dfd62ee7caad5bd07beaa':
Import translations. DO NOT MERGE

commit | commitdiff | tree

David Friedman [Fri, 5 Dec 2014 21:20:29 +0000 (21:20 +0000)]

am b69f1f0b: am 29b04001: am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs

* commit 'b69f1f0b6ceb69c2af873309c1f1bcf1c0dc8ed5':
Fixes a typo, in which the word "give" is repeated. Bug 18553334

commit | commitdiff | tree

Svetoslav [Fri, 5 Dec 2014 21:20:22 +0000 (21:20 +0000)]

am 323c02d4: am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev

* commit '323c02d4e0860c925aa0c4db14be8acaf231c69b':
Notify accessibility for window changes after an app animation end.

commit | commitdiff | tree

Justin Harrison [Fri, 5 Dec 2014 21:20:07 +0000 (21:20 +0000)]

am ff4f2486: am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev

* commit 'ff4f24866cb87c1110fb26bade3b6017d51805f4':
Revert "Revert "Improve fling physics for recents""

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 21:20:02 +0000 (21:20 +0000)]

am e1d4b9fa: am 8432cee0: am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev

* commit 'e1d4b9fab1cc89eab8ca85bfea000a3c6bbd4dd1':
Prevent ANR when broadcast receiver is killed

commit | commitdiff | tree

Paul Jensen [Fri, 5 Dec 2014 21:19:57 +0000 (21:19 +0000)]

am 704c8c0c: am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev

* commit '704c8c0c3b2753c8d91aef23d39a9f6255389fd3':
Remember to cancel lingering when a network again satsifies a NetworkRequest.

commit | commitdiff | tree

Prerepa Viswanadham [Fri, 5 Dec 2014 21:19:53 +0000 (21:19 +0000)]

am 12120998: am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user

* commit '12120998f8b34c809d8f29790a8f74e624b26e38':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user

commit | commitdiff | tree

David Friedman [Fri, 5 Dec 2014 20:19:43 +0000 (20:19 +0000)]

am 753f4fc9: am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs

* commit '753f4fc95135a396ac9d7f6f4e3f9eacb662bb1d':
Change notes for NDK r10d, to publish to DAC

commit | commitdiff | tree

Geoff Mendal [Fri, 5 Dec 2014 20:19:37 +0000 (20:19 +0000)]

am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '135a5761857f9dbd31ab51abe6466e26ddb379cd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

David Friedman [Fri, 5 Dec 2014 20:19:30 +0000 (20:19 +0000)]

am 29b04001: am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs

* commit '29b040019226d7d02a57fe76a471465d16109f0b':
Fixes a typo, in which the word "give" is repeated. Bug 18553334

commit | commitdiff | tree

Svetoslav [Fri, 5 Dec 2014 20:19:24 +0000 (20:19 +0000)]

am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev

* commit '8d9a06feee0d5311e40adbccb0d2205a531def85':
Notify accessibility for window changes after an app animation end.

commit | commitdiff | tree

Justin Harrison [Fri, 5 Dec 2014 20:19:10 +0000 (20:19 +0000)]

am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev

* commit '2b236ab30e479d22c0619670a97c90993307a190':
Revert "Revert "Improve fling physics for recents""

commit | commitdiff | tree

Craig Mautner [Fri, 5 Dec 2014 20:18:58 +0000 (20:18 +0000)]

am 8432cee0: am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev

* commit '8432cee04f2ec4bf77a3ba84524148b78db7ea57':
Prevent ANR when broadcast receiver is killed

commit | commitdiff | tree

Paul Jensen [Fri, 5 Dec 2014 20:18:45 +0000 (20:18 +0000)]

am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev

* commit '461e73677d208e4e97356cbc781ce490b90e2027':
Remember to cancel lingering when a network again satsifies a NetworkRequest.

commit | commitdiff | tree

Prerepa Viswanadham [Fri, 5 Dec 2014 20:18:38 +0000 (20:18 +0000)]

am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user

* commit 'e21aafab0d735935155860bd16dcc3ece81ce546':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user

commit | commitdiff | tree

Adam Powell [Fri, 5 Dec 2014 19:48:05 +0000 (19:48 +0000)]

am 19623538: am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"

* commit '19623538735fac497325e2082a0ba56c199fc6b1':
Fix NullPointerException in ListView

commit | commitdiff | tree

Adam Powell [Fri, 5 Dec 2014 19:39:25 +0000 (19:39 +0000)]

am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"

* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
Fix NullPointerException in ListView

commit | commitdiff | tree

Adam Powell [Fri, 5 Dec 2014 19:32:13 +0000 (19:32 +0000)]

am 8c9283f4: Merge "Fix NullPointerException in ListView"

* commit '8c9283f41083a20a82ae37eac44b79de6eb3158e':
Fix NullPointerException in ListView

commit | commitdiff | tree

Adam Powell [Fri, 5 Dec 2014 19:26:16 +0000 (19:26 +0000)]

Merge "Fix NullPointerException in ListView"

commit | commitdiff | tree

Adam Lesinski [Fri, 5 Dec 2014 19:16:27 +0000 (19:16 +0000)]

am e97908d3: Merge commit \'0953ab27\' into manualmerge

* commit 'e97908d32ee8ea80138d085260a0eac93841c722':
AAPT: Move private attrs to new type for framework

commit | commitdiff | tree

Scott Main [Fri, 5 Dec 2014 19:15:47 +0000 (19:15 +0000)]

Merge ":docs support library updates"

commit | commitdiff | tree

Adam Lesinski [Fri, 5 Dec 2014 19:06:21 +0000 (11:06 -0800)]

Merge commit '0953ab27' into manualmerge

Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32