OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Fix for the missing sync bug\" into nyc-dev
Shreyas Basarge [Mon, 20 Jun 2016 17:30:21 +0000 (17:30 +0000)]
Merge \"Fix for the missing sync bug\" into nyc-dev
am: 70b6cd903e

Change-Id: Iea3af329cf5aaf370c4454ef35f8c35c36b6d04c

8 years agoMerge \"assume a generous prior in the rate estimator\" into nyc-dev
Chris Wren [Mon, 20 Jun 2016 17:30:15 +0000 (17:30 +0000)]
Merge \"assume a generous prior in the rate estimator\" into nyc-dev
am: fddf5df01f

Change-Id: I4a526dd0467a6f57e9e919817f87d643071ae81b

8 years agoMerge "Fix for the missing sync bug" into nyc-dev
Shreyas Basarge [Mon, 20 Jun 2016 09:17:20 +0000 (09:17 +0000)]
Merge "Fix for the missing sync bug" into nyc-dev

8 years agoMerge "assume a generous prior in the rate estimator" into nyc-dev
Chris Wren [Sat, 18 Jun 2016 19:28:16 +0000 (19:28 +0000)]
Merge "assume a generous prior in the rate estimator" into nyc-dev

8 years agoMerge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into...
John Reck [Sat, 18 Jun 2016 02:14:29 +0000 (02:14 +0000)]
Merge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into nyc-dev
am: d11b5e6661

Change-Id: I1caf2fbac785c68c6afeb61b60493e728a83a670

8 years agoMerge "DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it" into...
TreeHugger Robot [Sat, 18 Jun 2016 02:07:04 +0000 (02:07 +0000)]
Merge "DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it" into nyc-dev

8 years agoMerge \"Avoid re-calculating vsync mid-frame\" into nyc-dev
John Reck [Sat, 18 Jun 2016 02:05:17 +0000 (02:05 +0000)]
Merge \"Avoid re-calculating vsync mid-frame\" into nyc-dev
am: fc275d244e

Change-Id: Ic46d2d9627c4dcbd345b49f01af0bf3b8247259c

8 years agoMerge "Avoid re-calculating vsync mid-frame" into nyc-dev
TreeHugger Robot [Sat, 18 Jun 2016 02:00:59 +0000 (02:00 +0000)]
Merge "Avoid re-calculating vsync mid-frame" into nyc-dev

8 years agoMerge \"Fix a race in local settings caches\" into nyc-dev
Svetoslav Ganov [Sat, 18 Jun 2016 00:38:28 +0000 (00:38 +0000)]
Merge \"Fix a race in local settings caches\" into nyc-dev
am: f4ddb7ce30

Change-Id: Ia973ef68382ac359908b83be3dbca485c91d5cd6

8 years agoMerge "Fix a race in local settings caches" into nyc-dev
TreeHugger Robot [Sat, 18 Jun 2016 00:30:26 +0000 (00:30 +0000)]
Merge "Fix a race in local settings caches" into nyc-dev

8 years agoMerge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
Calvin On [Sat, 18 Jun 2016 00:20:14 +0000 (00:20 +0000)]
Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
am: 1bf8782605

Change-Id: I9d82cab156e81e87faf965ed1c9b37bc73359cc0

8 years agoMerge "Fix race with BT disable in BLE_ON_STATE" into nyc-dev
Andre Eisenbach [Sat, 18 Jun 2016 00:15:18 +0000 (00:15 +0000)]
Merge "Fix race with BT disable in BLE_ON_STATE" into nyc-dev

8 years agoMerge \"Fix data race\" into nyc-dev
Adrian Roos [Fri, 17 Jun 2016 23:50:12 +0000 (23:50 +0000)]
Merge \"Fix data race\" into nyc-dev
am: 838dfe60f0

Change-Id: I4aa6d76b855bcbb9d570ddcfcf8f8c61c135930d

8 years agoMerge "Fix data race" into nyc-dev
TreeHugger Robot [Fri, 17 Jun 2016 23:42:58 +0000 (23:42 +0000)]
Merge "Fix data race" into nyc-dev

8 years agoMerge \"Unspecified alarm worksource names are the rule, not the exception\" into...
Christopher Tate [Fri, 17 Jun 2016 23:30:29 +0000 (23:30 +0000)]
Merge \"Unspecified alarm worksource names are the rule, not the exception\" into nyc-dev
am: 4eaaf7c8ff

Change-Id: I92267b8ce147e9172147e0bea4ac2c23e91f6e8b

8 years agoMerge "Unspecified alarm worksource names are the rule, not the exception" into nyc-dev
Chris Tate [Fri, 17 Jun 2016 23:20:18 +0000 (23:20 +0000)]
Merge "Unspecified alarm worksource names are the rule, not the exception" into nyc-dev

8 years agoMerge \\\"Fix spelling error in Core App Quality docs.\\\" into mnc-io-docs am: 3c8b9...
Aurimas Liutikas [Fri, 17 Jun 2016 23:14:24 +0000 (23:14 +0000)]
Merge \\\"Fix spelling error in Core App Quality docs.\\\" into mnc-io-docs am: 3c8b96ad1f am: cd9cc200d8
am: f33ce4e846

Change-Id: Icc8411877a5dc99d65809c9b184ffb159ca0de89

8 years agoUnspecified alarm worksource names are the rule, not the exception
Christopher Tate [Fri, 17 Jun 2016 23:09:31 +0000 (16:09 -0700)]
Unspecified alarm worksource names are the rule, not the exception

Bug 29443799

Change-Id: I6457a3680a26c900ed9c8e2ac2ab3f5fc4dfc007

8 years agoMerge \\"Fix spelling error in Core App Quality docs.\\" into mnc-io-docs am: 3c8b96ad1f
Aurimas Liutikas [Fri, 17 Jun 2016 23:11:23 +0000 (23:11 +0000)]
Merge \\"Fix spelling error in Core App Quality docs.\\" into mnc-io-docs am: 3c8b96ad1f
am: cd9cc200d8

Change-Id: I590329103ed52b33e01b90964fa2a142c9e6e133

8 years agoMerge \"Fix spelling error in Core App Quality docs.\" into mnc-io-docs
Aurimas Liutikas [Fri, 17 Jun 2016 23:06:08 +0000 (23:06 +0000)]
Merge \"Fix spelling error in Core App Quality docs.\" into mnc-io-docs
am: 3c8b96ad1f

Change-Id: I78b545d5bf018f7c9fd94397365753c8120700fe

8 years agoMerge "Fix spelling error in Core App Quality docs." into mnc-io-docs
Aurimas Liutikas [Fri, 17 Jun 2016 22:57:01 +0000 (22:57 +0000)]
Merge "Fix spelling error in Core App Quality docs." into mnc-io-docs

8 years agoFix a race in local settings caches
Svetoslav Ganov [Fri, 17 Jun 2016 22:27:43 +0000 (15:27 -0700)]
Fix a race in local settings caches

We send a handle to the generation tracker along with the first accessed
setting but don't send the generation id of when the setting was
actually looked up. So by the time the client gets the setting with the
generation tracker from which to get and cache the last generation the
setting may have changed. We need to pass the generation id along with
the value and the generation tracker.

bug:29458487

Change-Id: I0ac4955ba5b10b547f8fe653a7c28e048a4691eb

8 years agoMerge \"Add pm operation to set user restrictions.\" into nyc-dev
Sudheer Shanka [Fri, 17 Jun 2016 22:08:07 +0000 (22:08 +0000)]
Merge \"Add pm operation to set user restrictions.\" into nyc-dev
am: f6824b51cc

Change-Id: I137151742049c0a02d41a02e49abb679234f14b9

8 years agoMerge "Add pm operation to set user restrictions." into nyc-dev
TreeHugger Robot [Fri, 17 Jun 2016 22:03:58 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into nyc-dev

8 years agoMerge \"Clean up ex-users in lock settings db\" into nyc-dev
Amith Yamasani [Fri, 17 Jun 2016 22:01:35 +0000 (22:01 +0000)]
Merge \"Clean up ex-users in lock settings db\" into nyc-dev
am: 8cbe1a6309

Change-Id: I97a70eafc6e6657b8d0f87a134c17499d66ccc77

8 years agoMerge \"Don\'t dispatch Uris with appended user handle\" into nyc-dev
Svet Ganov [Fri, 17 Jun 2016 22:01:32 +0000 (22:01 +0000)]
Merge \"Don\'t dispatch Uris with appended user handle\" into nyc-dev
am: 7ef9f61be6

Change-Id: I1ecce2c6c319fa22a09472f110823798e3ffee9f

8 years agoMerge "Clean up ex-users in lock settings db" into nyc-dev
Amith Yamasani [Fri, 17 Jun 2016 21:55:59 +0000 (21:55 +0000)]
Merge "Clean up ex-users in lock settings db" into nyc-dev

8 years agoMerge "Don't dispatch Uris with appended user handle" into nyc-dev
Svetoslav Ganov [Fri, 17 Jun 2016 21:51:33 +0000 (21:51 +0000)]
Merge "Don't dispatch Uris with appended user handle" into nyc-dev

8 years agoFix data race
Adrian Roos [Fri, 17 Jun 2016 21:28:27 +0000 (14:28 -0700)]
Fix data race

Fixes a race in BluetoothControllerImpl that could lead
to a ConcurrentModificationException, by moving the manipulation
of the callbacks array to the handler.

Change-Id: I7c3be74d239d4706f55357f54e539b7b6439e76d
Fixes: 29390132

8 years agoMerge \"Ensure that the tint is properly applied in docked mode.\" into nyc-dev
Winson [Fri, 17 Jun 2016 21:34:21 +0000 (21:34 +0000)]
Merge \"Ensure that the tint is properly applied in docked mode.\" into nyc-dev
am: b1f3404f8f

Change-Id: I60d795b21f9a5a2b0f2555e959607a8dfefa7e9f

8 years agoMerge "Ensure that the tint is properly applied in docked mode." into nyc-dev
Winson Chung [Fri, 17 Jun 2016 21:29:02 +0000 (21:29 +0000)]
Merge "Ensure that the tint is properly applied in docked mode." into nyc-dev

8 years agoFix race with BT disable in BLE_ON_STATE
Calvin On [Thu, 16 Jun 2016 00:58:23 +0000 (17:58 -0700)]
Fix race with BT disable in BLE_ON_STATE

This will restart the BT stack when it detects a transition
into OFF state while the user enable flag (mEnable) is set.

Bug: 29363429
Change-Id: I9839119b34c4694ad92e96240c6989008b2f8d52

8 years agoAvoid re-calculating vsync mid-frame
John Reck [Fri, 17 Jun 2016 19:57:12 +0000 (12:57 -0700)]
Avoid re-calculating vsync mid-frame

Fixes: 29072773

By using computeFrameTime AnimationContext would
potentially end up modifying the latest vsync if
a very-slow frame was received from the UI thread.

This could potentially desync animations that were
RT & UI thread 'synchronized', but more significantly
it would confuse the swap chain which tries to only
draw one frame per vsync causing unneccessary frame
drops.

Change-Id: Ibd2ec3157ce32fee1eec8d56837c45a35e622895

8 years agoMerge \"Work on issue #29328569: NPE in \" com.google.android.configupdater\"\" into...
Dianne Hackborn [Fri, 17 Jun 2016 20:39:32 +0000 (20:39 +0000)]
Merge \"Work on issue #29328569: NPE in \" com.google.android.configupdater\"\" into nyc-dev
am: 6bc33b07f4

Change-Id: Idff85b167a76c6a1bda3fe7e1b5fd2a5cfc6eccc

8 years agoMerge "Work on issue #29328569: NPE in " com.google.android.configupdater"" into...
Dianne Hackborn [Fri, 17 Jun 2016 20:33:21 +0000 (20:33 +0000)]
Merge "Work on issue #29328569: NPE in " com.google.android.configupdater"" into nyc-dev

8 years agoMerge \"QS Edit: Fix auto-selecting add location\" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 20:28:14 +0000 (20:28 +0000)]
Merge \"QS Edit: Fix auto-selecting add location\" into nyc-dev
am: dd65ee628f

Change-Id: I33256558f03d993c88520ff50d4bab915ee7ccbd

8 years agoDO NOT MERGE Move SurfaceView offscreen if the app stops drawing it
John Reck [Thu, 16 Jun 2016 22:36:13 +0000 (15:36 -0700)]
DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it

Bug: 29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
(cherry picked from commit aa6e84f21ddf89ea649a3f00044bc23adfe86978)

8 years agoMerge "QS Edit: Fix auto-selecting add location" into nyc-dev
TreeHugger Robot [Fri, 17 Jun 2016 20:22:45 +0000 (20:22 +0000)]
Merge "QS Edit: Fix auto-selecting add location" into nyc-dev

8 years agoassume a generous prior in the rate estimator
Chris Wren [Fri, 17 Jun 2016 19:47:19 +0000 (15:47 -0400)]
assume a generous prior in the rate estimator

currently with one data point the estimator is biased high. If we don't
have any data we want to be biased low to allow the first interaction
to be an isolated burst.

Also add metrics for enqueue rate to make it easier to debug this
code in the future (currently we only have metrics after the
rate limiter).

Bug: 29379789
Change-Id: I7b1d379290a55f120d039fd29d1bc0abbc6d4932

8 years agoMerge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 18:45:04 +0000 (18:45 +0000)]
Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
am: fc70b07385

Change-Id: I2aed24cf36354fbe332787082bcf628357bab3b1

8 years agoMerge \"Merge \\\"Docs: Completed updates to the Data Binding docs\\\" into mnc-io...
Hemal Patel [Fri, 17 Jun 2016 18:40:46 +0000 (18:40 +0000)]
Merge \"Merge \\\"Docs: Completed updates to the Data Binding docs\\\" into mnc-io-docs am: eebe22fef6 am: f693ea687f\" into nyc-dev
am: 68bfdd71b5

Change-Id: Ic5b6de49c28329330477b7881c64eb0614628f4d

8 years agoMerge \"docs: NDK r12 release notes and downloads\" into nyc-dev
Joe Fernandez [Fri, 17 Jun 2016 18:40:37 +0000 (18:40 +0000)]
Merge \"docs: NDK r12 release notes and downloads\" into nyc-dev
am: 9f0722a4c7

Change-Id: If4d04180cb625f319887ea156cdfec25245d6031

8 years agoMerge "QS API: Fix mService and mTile being null once and for all" into nyc-dev
TreeHugger Robot [Fri, 17 Jun 2016 18:38:25 +0000 (18:38 +0000)]
Merge "QS API: Fix mService and mTile being null once and for all" into nyc-dev

8 years agoMerge "Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs...
Android Build Merger (Role) [Fri, 17 Jun 2016 18:35:50 +0000 (18:35 +0000)]
Merge "Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am: eebe22fef6 am: f693ea687f" into nyc-dev

8 years agoMerge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am...
Hemal Patel [Fri, 17 Jun 2016 18:35:24 +0000 (18:35 +0000)]
Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am: eebe22fef6
am: f693ea687f

Change-Id: I235e73606098e54fc14568c6437af314f9bea337

8 years agoMerge "docs: NDK r12 release notes and downloads" into nyc-dev
Joe Fernandez [Fri, 17 Jun 2016 18:35:07 +0000 (18:35 +0000)]
Merge "docs: NDK r12 release notes and downloads" into nyc-dev

8 years agoMerge \"Docs: Completed updates to the Data Binding docs\" into mnc-io-docs
Yigit Boyar [Fri, 17 Jun 2016 18:31:17 +0000 (18:31 +0000)]
Merge \"Docs: Completed updates to the Data Binding docs\" into mnc-io-docs
am: eebe22fef6

Change-Id: I47b4003b1bd1bb5cdfc12bde543dd2c9d8babdcc

8 years agoMerge \"Do a forceLayout if pending insets is changed after relayout window\" into...
Chong Zhang [Fri, 17 Jun 2016 18:26:45 +0000 (18:26 +0000)]
Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
am: 2756d0707f

Change-Id: Ia95dd424c118b962a9a10ac074d508758b49ea90

8 years agoMerge "Docs: Completed updates to the Data Binding docs" into mnc-io-docs
Hemal Patel [Fri, 17 Jun 2016 18:25:47 +0000 (18:25 +0000)]
Merge "Docs: Completed updates to the Data Binding docs" into mnc-io-docs

8 years agoMerge "Do a forceLayout if pending insets is changed after relayout window" into...
Chong Zhang [Fri, 17 Jun 2016 18:22:29 +0000 (18:22 +0000)]
Merge "Do a forceLayout if pending insets is changed after relayout window" into nyc-dev

8 years agodocs: NDK r12 release notes and downloads
Joe Fernandez [Thu, 16 Jun 2016 20:31:28 +0000 (13:31 -0700)]
docs: NDK r12 release notes and downloads

b/29188616

Change-Id: Ida2b9b0e308799f9001127006e3be84318857aaa

8 years agoMerge \"Fix shade background not aligning with bottom of a group\" into nyc-dev
Mady Mellor [Fri, 17 Jun 2016 17:26:54 +0000 (17:26 +0000)]
Merge \"Fix shade background not aligning with bottom of a group\" into nyc-dev
am: 4f9404f6f2

Change-Id: I50aab94c497af12a3f2d3522425ddd850c2e3793

8 years agoMerge \"Bring out your toggles\" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:26:50 +0000 (17:26 +0000)]
Merge \"Bring out your toggles\" into nyc-dev
am: 3aee783837

Change-Id: I50ac9d6382b10335464fb3608afbf0aeb9c1dc7b

8 years agoMerge "Fix shade background not aligning with bottom of a group" into nyc-dev
Mady Mellor [Fri, 17 Jun 2016 17:22:34 +0000 (17:22 +0000)]
Merge "Fix shade background not aligning with bottom of a group" into nyc-dev

8 years agoMerge "Bring out your toggles" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:22:01 +0000 (17:22 +0000)]
Merge "Bring out your toggles" into nyc-dev

8 years agoQS Edit: Fix auto-selecting add location
Jason Monk [Fri, 17 Jun 2016 17:15:34 +0000 (13:15 -0400)]
QS Edit: Fix auto-selecting add location

We depend on a layout listener for when we ask for focus, but layout
sometimes doesn't happen.  Make it always happen.

Change-Id: I7c805470c6ce9863bf7eac627f59d49191ce8946
Fixes: 29126464

8 years agoQS API: Fix mService and mTile being null once and for all
Jason Monk [Fri, 17 Jun 2016 16:42:59 +0000 (12:42 -0400)]
QS API: Fix mService and mTile being null once and for all

Change-Id: Idd82e4c2f6cfc2b30432e15e23963c1d7a959e43
Fixes: 29121793

8 years agoFix spelling error in Core App Quality docs.
Aurimas Liutikas [Thu, 16 Jun 2016 19:15:56 +0000 (12:15 -0700)]
Fix spelling error in Core App Quality docs.

Bug:
https://code.google.com/p/android/issues/detail?id=213248

Change-Id: Idf83eb4fdc09bc3c78a7786b4bf11707178092c7
(cherry picked from commit 08b10586120f3db6e29e5ece9c3e05462f0c01e9)

8 years agoMerge \"Do not schedule restarts if the system is shutting down\" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 16:09:08 +0000 (16:09 +0000)]
Merge \"Do not schedule restarts if the system is shutting down\" into nyc-dev
am: 1f0151220e

Change-Id: Ifca7385204731e6b764fbeda59570f1789ecc0e0

8 years agoMerge \"Call AppOpsService from the handler thread\" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 16:03:54 +0000 (16:03 +0000)]
Merge \"Call AppOpsService from the handler thread\" into nyc-dev
am: 1347cdb2e1

Change-Id: If17588d0b12412c88e21d8a2ee3ee9bfc4778589

8 years agoMerge "Do not schedule restarts if the system is shutting down" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 16:01:09 +0000 (16:01 +0000)]
Merge "Do not schedule restarts if the system is shutting down" into nyc-dev

8 years agoMerge "Call AppOpsService from the handler thread" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 15:59:06 +0000 (15:59 +0000)]
Merge "Call AppOpsService from the handler thread" into nyc-dev

8 years agoBring out your toggles
Jason Monk [Fri, 17 Jun 2016 14:19:43 +0000 (10:19 -0400)]
Bring out your toggles

Switch Wifi and BT back to toggling from QQS.  Make cell open a
detail panel.

Change-Id: Ibdd8fa52a31c4bf81ee0e6974e263b46b6f71a31
Fixes: 29406644

8 years agoMerge \"Notify user when application does not support current display zoom\" into...
Alan Viverette [Fri, 17 Jun 2016 14:05:14 +0000 (14:05 +0000)]
Merge \"Notify user when application does not support current display zoom\" into nyc-dev
am: c577a50d09

Change-Id: Ibab788d39a4b93ef57aaffd81debd0447ffa8f9a

8 years agoMerge "Notify user when application does not support current display zoom" into nyc-dev
Alan Viverette [Fri, 17 Jun 2016 13:59:12 +0000 (13:59 +0000)]
Merge "Notify user when application does not support current display zoom" into nyc-dev

8 years agoMerge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
Tony Mak [Fri, 17 Jun 2016 13:31:43 +0000 (13:31 +0000)]
Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
am: ab8d4cf645

Change-Id: If1ed361c6f8c7008271cf1da4317c9ac47a5af73

8 years agoMerge "Allow stopping user to access AppWidgetService API" into nyc-dev
Tony Mak [Fri, 17 Jun 2016 13:25:05 +0000 (13:25 +0000)]
Merge "Allow stopping user to access AppWidgetService API" into nyc-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 05:16:42 +0000 (05:16 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 12af7eb3ab  -s ours

Change-Id: I25c71a14da3d1fa62d7916f2cc54fb987d87d2f6

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 05:09:37 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 05:03:23 +0000 (05:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 3aca33df86  -s ours

Change-Id: I021c66cdef761d5eac267b21f5e3c28ec9e8a883

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:56:29 +0000 (04:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 90730d5542  -s ours

Change-Id: I5d6d7f5e5c620226242060dfbb14f0464aacc98f

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:56:27 +0000 (04:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: d063b809ec  -s ours

Change-Id: I72d0c6acc64adc5852e95f804ef7b7f4730b6e8f

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:53:13 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:50:56 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:50:40 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:47:08 +0000 (04:47 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 036c415394  -s ours

Change-Id: I5e2c9b89ed067793303ab901de2ac95401ea37a3

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:42:18 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:28:28 +0000 (04:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 11b2b26911  -s ours

Change-Id: If8ae0b33ababcad202f1413032772182acb73de3

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:28:26 +0000 (04:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 0555bb3003  -s ours

Change-Id: I07fc3a494ca2ab9e5585febd187c08073483c297

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:23:13 +0000 (04:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: c52cdca3a6  -s ours

Change-Id: I28de93fe3f11438c86a95d8ec265f5f690e6f617

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:23:11 +0000 (04:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: f81b519438  -s ours

Change-Id: I92d23239291c708c36e0096719ed0420fa360ef2

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:22:50 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:22:08 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:18:05 +0000 (04:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: c4a5178d66  -s ours

Change-Id: I2399e19b8b0e9080531f47ca66d552e909b6533b

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:18:04 +0000 (04:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: b141b6399f  -s ours

Change-Id: Ic9c2413d05260cdebcf38d729e129a5fa19a0bff

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:16:11 +0000 (04:16 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:15:51 +0000 (04:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:13:19 +0000 (04:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:12:45 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:45:54 +0000 (19:45 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I450ba7622c907e80c033482bfc172191f3b37f0a

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:24:25 +0000 (19:24 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I695f05865fc2e7ae823f4ffe1798b3aa31d72e43

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:21:52 +0000 (19:21 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Iae320ca99c6b3f680aac48a15c116ba64943402b

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:19:18 +0000 (19:19 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I54cae0a8ea108c66939d3ee1323e32ced1e75a23

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:12:59 +0000 (19:12 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: If1a0f4a9b8a7329642534da75e53f5880b4499a6

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:08:15 +0000 (19:08 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Idc9770710ba28c470425d671a454a040d50d0ff4

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:05:49 +0000 (19:05 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ib1d2355bb12e8090464730a3f8879b8aaf216d5a

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 02:01:14 +0000 (19:01 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I7e5fb3ca809a9b3957f562a6020ffc0de18a0a64

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 01:58:50 +0000 (18:58 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I306c97d17e5448007f5ba1bfa0871d585436c061

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 17 Jun 2016 01:56:24 +0000 (18:56 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I6cbdf2d9ffe8670574717af9e7e676fd6d2843fc

8 years agoDo not schedule restarts if the system is shutting down
Fyodor Kupolov [Thu, 16 Jun 2016 23:29:05 +0000 (16:29 -0700)]
Do not schedule restarts if the system is shutting down

Bug: 29357754
Change-Id: Id5cf43fb6c4c6ea04d60bd09e910a9cec194c753