OSDN Git Service
Android Build Merger (Role) [Tue, 21 Jun 2016 23:36:47 +0000 (23:36 +0000)]
Merge "Merge \"Fixed notificaiton Stress Test\" into nyc-dev am:
2f59ee10b2" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 21 Jun 2016 23:36:16 +0000 (23:36 +0000)]
Merge "Merge \"Always report window move to client\" into nyc-dev am:
aab580af55" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 21 Jun 2016 23:35:58 +0000 (23:35 +0000)]
Merge "Merge \"Add getApplicationConfigForPackage\" into nyc-dev am:
abe85d3886" into nyc-mr1-dev
Makoto Onuki [Tue, 21 Jun 2016 23:35:14 +0000 (23:35 +0000)]
Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev
Bennie Ouyang [Tue, 21 Jun 2016 23:35:06 +0000 (23:35 +0000)]
Merge \"Fixed notificaiton Stress Test\" into nyc-dev
am:
2f59ee10b2
Change-Id: I7d52973c6d2d85b3aef692b7447d7ab77034d939
Wale Ogunwale [Tue, 21 Jun 2016 23:35:04 +0000 (23:35 +0000)]
Merge \"Always report window move to client\" into nyc-dev
am:
aab580af55
Change-Id: I393911325b175a545de3ffc8a68348ed08954782
Chad Brubaker [Tue, 21 Jun 2016 23:35:00 +0000 (23:35 +0000)]
Merge \"Add getApplicationConfigForPackage\" into nyc-dev
am:
abe85d3886
Change-Id: I9eb13d905ee68e16b64702180c196f12c9b68828
Andrew Sapperstein [Tue, 21 Jun 2016 23:02:12 +0000 (23:02 +0000)]
Merge "Add some themes to let Settings use DeviceDefault." into nyc-mr1-dev
Felipe Leme [Tue, 21 Jun 2016 22:15:33 +0000 (22:15 +0000)]
Merge "resolve merge conflicts of
fa2715e to nyc-mr1-dev" into nyc-mr1-dev
Makoto Onuki [Tue, 21 Jun 2016 18:13:53 +0000 (11:13 -0700)]
Shortcut Manager: Address API council feedback and fix TODOs
Bug
29515722
Bug
29516909
Bug
29515090
Bug
29516954
Bug
29515088
Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
TreeHugger Robot [Tue, 21 Jun 2016 20:49:28 +0000 (20:49 +0000)]
Merge "Added explicit cast so it compiles on Eclipse." into nyc-mr1-dev
Bennie Ouyang [Tue, 21 Jun 2016 20:42:01 +0000 (20:42 +0000)]
Merge "Fixed notificaiton Stress Test" into nyc-dev
Andrew Sapperstein [Sun, 12 Jun 2016 21:41:35 +0000 (14:41 -0700)]
Add some themes to let Settings use DeviceDefault.
There were a couple of material themes without the equivalent
DeviceDefault variants.
Also added a new theme overlay that styles something like the
dark action bar but also overrides the accent color.
BUG:
28625050
Change-Id: I2c119a22cb99169a0fed293046fba25d516c7e73
Andrew Sapperstein [Tue, 21 Jun 2016 20:15:40 +0000 (20:15 +0000)]
Merge "Update System UI to use theme colors." into nyc-mr1-dev
Felipe Leme [Tue, 21 Jun 2016 20:08:55 +0000 (13:08 -0700)]
resolve merge conflicts of
fa2715e to nyc-mr1-dev
Change-Id: If0a1e7e70aa33e99f05694a37c2a54c567449507
TreeHugger Robot [Tue, 21 Jun 2016 20:09:06 +0000 (20:09 +0000)]
Merge "Prevent startNavigating() call when GPS is off" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 19:55:54 +0000 (19:55 +0000)]
Merge "Always report window move to client" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 19:51:19 +0000 (19:51 +0000)]
Merge "Add getApplicationConfigForPackage" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 19:50:59 +0000 (19:50 +0000)]
Merge "Ignore system apps on enforceMeteredApnPolicy()." into nyc-dev
Dianne Hackborn [Tue, 21 Jun 2016 19:27:31 +0000 (19:27 +0000)]
Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev
am:
5f9afa968d
Change-Id: I7ca258416372dd251759aa920f51c2486d432f9c
Dianne Hackborn [Tue, 21 Jun 2016 19:18:36 +0000 (19:18 +0000)]
Merge "Reduce race when connecting to an existing content provider." into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 18:46:35 +0000 (18:46 +0000)]
Merge "Change prefix based upon mask" into nyc-mr1-dev
Andrew Sapperstein [Sun, 12 Jun 2016 20:17:16 +0000 (13:17 -0700)]
Update System UI to use theme colors.
Instead of using hardcoded values, use colorPrimary, colorAccent, etc
to style system UI. Required setting a theme on several views to
get the proper accent color in the right place.
Deletes a lot of hard-coded colors from the app.
Deletes an unused view: StatusBarHeaderView
BUG:
28625050
BUG:
29003410
BUG:
28625105
Change-Id: I46cd8eba7cf5afdab53c7882aa4aac5af46772a9
Selim Cinek [Tue, 21 Jun 2016 18:14:31 +0000 (18:14 +0000)]
Merge \"Fixed an issue where the deleteintent of children wasn\'t sent\" into nyc-dev
am:
1e7d8d3817
Change-Id: Ie998d47b0d029fe851569e6e99d1d16db3642409
Adrian Roos [Tue, 21 Jun 2016 18:09:52 +0000 (18:09 +0000)]
Merge \"Allow trust agents to run during provisioning\" into nyc-dev
am:
1dd403b61a
Change-Id: I3972f2f923b78bf57f8160b3a14a81df3972eea0
Selim Cinek [Tue, 21 Jun 2016 18:07:41 +0000 (18:07 +0000)]
Merge "Fixed an issue where the deleteintent of children wasn't sent" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 18:04:05 +0000 (18:04 +0000)]
Merge "Allow trust agents to run during provisioning" into nyc-dev
Bill Yi [Tue, 21 Jun 2016 17:08:19 +0000 (17:08 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
284a71ecd6 -s ours
Change-Id: I2fa02988a5341ac04c96f87389195349e71cc83d
Bill Yi [Tue, 21 Jun 2016 17:08:17 +0000 (17:08 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
d837e61078 -s ours
Change-Id: Ic3a26c3fa5e0ac0762eb79b29b23f72c82b5bb74
Dianne Hackborn [Mon, 20 Jun 2016 22:20:15 +0000 (15:20 -0700)]
Reduce race when connecting to an existing content provider.
We lost the code that checks to see if the target process still
exists and aborts trying to use it if so. To reduce the race
there, we have a new explicit check of the state of the process.
Hopefully fixes some of issue #
28737082.
Change-Id: I37a7a6e9767516d564168ef5e110c4adafe3fb76
Bennie Ouyang [Mon, 20 Jun 2016 18:01:54 +0000 (11:01 -0700)]
Fixed notificaiton Stress Test
Bug:
29506953
Change-Id: I8f8e7b2f0b03b48665b524472a8e81aef6a7a708
Sanket Padawe [Tue, 21 Jun 2016 16:56:20 +0000 (16:56 +0000)]
Merge "Unhide Network types in TelephonyManager" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:52:39 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:52:26 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:52:05 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:51:50 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Todd Kennedy [Tue, 21 Jun 2016 16:42:08 +0000 (09:42 -0700)]
Change prefix based upon mask
The mask may not be all F's.
Change-Id: I50ff4e4fb95af2037b84a1531b60dd9c0986bf86
Dante Russo [Mon, 20 Jun 2016 18:11:59 +0000 (11:11 -0700)]
Prevent startNavigating() call when GPS is off
When system comes back from idle state,
GnssLocationProvider invokes startNavigating()
even when GPS is turned off in settings.
Bug:
29512509
Change-Id: Ifcc6a06d698f65f868d18244f7166663ab57f57e
CRs-Fixed:
1022372
Fan Zhang [Tue, 21 Jun 2016 15:28:29 +0000 (15:28 +0000)]
Merge "Add metrics for button taps in Settings support tab." into nyc-mr1-dev
Alan Viverette [Tue, 21 Jun 2016 13:53:49 +0000 (13:53 +0000)]
Merge \"Only block invalidation in DrawableContainer initialization\" into nyc-dev
am:
7a372a13af
Change-Id: I21a7dbf975a8dca02d87b9a0f084a6af74d55834
Alan Viverette [Tue, 21 Jun 2016 13:47:19 +0000 (13:47 +0000)]
Merge "Only block invalidation in DrawableContainer initialization" into nyc-dev
sreevanis [Tue, 21 Jun 2016 11:58:53 +0000 (11:58 +0000)]
Merge \\\"Documented how to handle advertisements during audio playback.\\\" into mnc-io-docs am:
07340a654a am:
5fef4a7d44
am:
41a7bdec97
Change-Id: Ic6578db4f8d59387974be01b74bd28b86abde176
Sreevani Sreejith [Tue, 21 Jun 2016 11:55:54 +0000 (11:55 +0000)]
Merge \\"Documented how to handle advertisements during audio playback.\\" into mnc-io-docs am:
07340a654a
am:
5fef4a7d44
Change-Id: Ica1016e018fe5e278babd490b631414ad220f290
sreevanis [Tue, 21 Jun 2016 11:50:22 +0000 (11:50 +0000)]
Merge \"Documented how to handle advertisements during audio playback.\" into mnc-io-docs
am:
07340a654a
Change-Id: I58c4cb8ec6d86a1bb1464a4fedd14ff21ab3a863
Sreevani Sreejith [Tue, 21 Jun 2016 11:44:19 +0000 (11:44 +0000)]
Merge "Documented how to handle advertisements during audio playback." into mnc-io-docs
sreevanis [Tue, 14 Jun 2016 17:39:57 +0000 (10:39 -0700)]
Documented how to handle advertisements during audio playback.
Bug:
24986554
Change-Id: I02cc0500492661ae7cde6cdae30490c00f8e4b97
Andrei Stingaceanu [Tue, 21 Jun 2016 09:28:58 +0000 (09:28 +0000)]
Merge "Keyboard shortcuts: A11Y fixes cherry pick" into nyc-mr1-dev
Chris Banes [Mon, 20 Jun 2016 09:38:02 +0000 (10:38 +0100)]
Fix NPE in Toolbar - framework edition
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.
BUG:
28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
Bill Yi [Tue, 21 Jun 2016 08:08:26 +0000 (01:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09c2d72040aabd804cc592de9b61f9a41cb60fc8
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Jun 2016 07:53:23 +0000 (00:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c3ebf247f9029af5c1322e2a5c115a1d854196f
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Jun 2016 07:45:59 +0000 (00:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d7cc365a08a8c59e242fc7450606a549812799a
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Jun 2016 07:24:26 +0000 (00:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d44c51c82552053591fd0f45741f5cf05c956d6
Auto-generated-cl: translation import
Andrii Kulian [Tue, 21 Jun 2016 05:27:24 +0000 (05:27 +0000)]
Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am:
9980514ee0
Change-Id: I8c2b03438fdeed6bce12489c5639245b79097577
Andrii Kulian [Tue, 21 Jun 2016 05:17:58 +0000 (05:17 +0000)]
Merge "Compare intent filter when launching adjacent" into nyc-dev
Jeremie GARCIA [Tue, 21 Jun 2016 03:02:41 +0000 (03:02 +0000)]
Merge \"Parse \"vendor/priv-app\" to find privileged applications\" into nyc-dev
am:
8a1bc54ab0
Change-Id: I651efd38fa6dd6433a13e5eb7569d882866cbc1e
TreeHugger Robot [Tue, 21 Jun 2016 02:56:36 +0000 (02:56 +0000)]
Merge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 01:51:57 +0000 (01:51 +0000)]
Merge "Enable fingerprint nav by default" into nyc-mr1-dev
Felipe Leme [Mon, 20 Jun 2016 23:36:29 +0000 (16:36 -0700)]
Ignore system apps on enforceMeteredApnPolicy().
BUG:
29514913
Fixes:
29448383
Change-Id: I19eb004c937e1c872bbf82caa7a919e43d48a259
Jeremie GARCIA [Thu, 5 Nov 2015 17:27:59 +0000 (18:27 +0100)]
Parse "vendor/priv-app" to find privileged applications
Change-Id: Icbbafba96b7880f51ca3afcee53d5f3dd5b86a45
Signed-off-by: Jeremie GARCIA <jeremie.garcia@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Bug:
29488499
Wale Ogunwale [Mon, 20 Jun 2016 23:07:55 +0000 (23:07 +0000)]
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am:
f159b74608
Change-Id: I83edfb392f0f179b4c28aaab3eba0c51fe11d207
Wei Jia [Mon, 20 Jun 2016 23:07:53 +0000 (23:07 +0000)]
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am:
bd45be5032
Change-Id: I23b24e3430335e037809da0c0721bf1de0e529dd
TreeHugger Robot [Mon, 20 Jun 2016 23:03:45 +0000 (23:03 +0000)]
Merge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev
Wei Jia [Mon, 20 Jun 2016 22:58:32 +0000 (22:58 +0000)]
Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev
Wei Jia [Thu, 16 Jun 2016 22:18:20 +0000 (15:18 -0700)]
MediaPlayer: fix java doc for setPlaybackParams.
Bug:
29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
Sudheer Shanka [Mon, 20 Jun 2016 22:49:34 +0000 (22:49 +0000)]
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
am:
f00e780472
Change-Id: I542e11688a52dd3cde8fd8c3df252b2ead0e5240
smain@google.com [Mon, 20 Jun 2016 22:43:05 +0000 (22:43 +0000)]
Merge \"just a reorg of some links to put all Android Studio help button redirects together\" into nyc-dev
am:
db4ef3f4f8
Change-Id: Ie519bb30a4fc09c98901098b7124dfd5fef39238
Selim Cinek [Mon, 20 Jun 2016 22:40:07 +0000 (15:40 -0700)]
Fixed an issue where the deleteintent of children wasn't sent
Especially in context of autobundling this could lead to bad bugs
Change-Id: Idf722f9675f6f6e49d49c08798e38e09b1c5c01e
Fixes:
29515621
Sudheer Shanka [Mon, 20 Jun 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission." into nyc-dev
Antonio Cansado [Mon, 20 Jun 2016 22:29:45 +0000 (22:29 +0000)]
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
am:
c20ffc2a9e
Change-Id: I3839e516a128befbfe677b17b05a557b9e0afd87
Scott Main [Mon, 20 Jun 2016 22:28:54 +0000 (22:28 +0000)]
Merge "just a reorg of some links to put all Android Studio help button redirects together" into nyc-dev
smain@google.com [Mon, 20 Jun 2016 22:25:56 +0000 (15:25 -0700)]
just a reorg of some links to put all Android Studio help button redirects together
Change-Id: If928756a87b18a12caa21effa15c5005d74f15c6
Antonio Cansado [Mon, 20 Jun 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
Dianne Hackborn [Mon, 20 Jun 2016 22:21:53 +0000 (22:21 +0000)]
Merge \"Fix issue #
29438842: Enter the \"am broadcast -a...\" into nyc-dev
am:
d2480ab7bb
Change-Id: I57f8a28b73cb91f6602f7ac9dce67bdb5ea545aa
Dianne Hackborn [Mon, 20 Jun 2016 22:09:27 +0000 (22:09 +0000)]
Merge "Fix issue #
29438842: Enter the "am broadcast -a..." into nyc-dev
Roozbeh Pournader [Mon, 20 Jun 2016 22:08:21 +0000 (22:08 +0000)]
Merge "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"" into nyc-mr1-dev
Hemal Patel [Mon, 20 Jun 2016 22:04:37 +0000 (22:04 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214
am:
2a3336813a
Change-Id: Ie48aea195c987e29155013f699c36272dddc432e
Antonio Cansado [Mon, 20 Jun 2016 22:03:03 +0000 (15:03 -0700)]
Fix infinite loop when registering data usage callback.
Trivial fix is to call the method that takes the handler as a param.
Bug:
29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
Hemal Patel [Mon, 20 Jun 2016 22:01:02 +0000 (22:01 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e
am:
d5af0a1214
Change-Id: I70c520f7ee4141b3c7c193aef6e4559ea5b35cc9
Roozbeh Pournader [Mon, 20 Jun 2016 21:59:29 +0000 (14:59 -0700)]
Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"
This reverts commit
e977b0ae59bbd7af0ccdf56db6aa0a53c5e6414d for MR1.
The original commit is only intended for N, not MR1.
Adrian Roos [Mon, 20 Jun 2016 21:58:59 +0000 (14:58 -0700)]
Allow trust agents to run during provisioning
Fixes a bug where trust agents weren't able to run during
provisioning, because user presence is only acknowledged after
provisioning completed.
Change-Id: Ib9ed235e8372555fdc40eefd0fc6b1192613abda
Fixes:
29231515
Hemal Patel [Mon, 20 Jun 2016 21:53:54 +0000 (21:53 +0000)]
Docs: Changed sample link under Related Samples
am:
ab5de09e7e
Change-Id: Ic7423b2c59cb70ff8a13c8b67e51e5d6e572f278
Roozbeh Pournader [Mon, 20 Jun 2016 21:44:42 +0000 (21:44 +0000)]
Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
am:
160126e2d8
Change-Id: I9e26a77ba4e186a9e3fd59b9618b3eb36127178f
Roozbeh Pournader [Mon, 20 Jun 2016 21:39:20 +0000 (21:39 +0000)]
Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev
Hall Liu [Mon, 20 Jun 2016 21:37:44 +0000 (21:37 +0000)]
Merge \\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c am:
317d0cb169 am:
edace5e820 -s ours
am:
f184789ae9
Change-Id: I78ee2340cb7a4a42eb9c60d41a7947b9bb6f6a11
Hall Liu [Mon, 20 Jun 2016 21:31:36 +0000 (21:31 +0000)]
Merge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c am:
317d0cb169
am:
edace5e820 -s ours
Change-Id: Iab755e613521b81b0c8df57269e4c7752ae6011e
Hall Liu [Mon, 20 Jun 2016 21:28:09 +0000 (21:28 +0000)]
Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c
am:
317d0cb169
Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23
Hall Liu [Mon, 20 Jun 2016 21:21:25 +0000 (21:21 +0000)]
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am:
fc32ec1aef
am:
aeba34533c
Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
Wale Ogunwale [Mon, 20 Jun 2016 21:20:29 +0000 (21:20 +0000)]
Merge \"Revert \"Don\'t re-launch activities while the device is sleeping\"\" into nyc-dev
am:
beaf3707fa
Change-Id: I50f6a45a56650569047c046d275f39b0929c38e4
Wale Ogunwale [Mon, 20 Jun 2016 21:16:22 +0000 (14:16 -0700)]
Don't re-launch stopped activities while the device is sleeping
Don't ensure configuration for stopped activities while the device
is sleeping as we don't want to relaunch activities in this state.
Note that the right configuration will be applied to the activity
the next time we try to make it visible. The re-launch will happen
then.
Bug:
28518380
Change-Id: Id79d7817ba8f213d89cae6964de09cafe17481f9
Hall Liu [Mon, 20 Jun 2016 21:15:42 +0000 (21:15 +0000)]
Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am:
fc32ec1aef
Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
TreeHugger Robot [Mon, 20 Jun 2016 21:11:04 +0000 (21:11 +0000)]
Merge "Revert "Don't re-launch activities while the device is sleeping"" into nyc-dev
Makoto Onuki [Mon, 20 Jun 2016 21:06:40 +0000 (21:06 +0000)]
Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev
Hall Liu [Mon, 20 Jun 2016 21:04:41 +0000 (21:04 +0000)]
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev
Steve McKay [Mon, 20 Jun 2016 20:54:09 +0000 (20:54 +0000)]
Merge \"Make advanced storage option sticky...\" into nyc-dev
am:
361ccf5eef
Change-Id: Ibc7ebfa9d5f68014592b4fb8793358be5436efce
TreeHugger Robot [Mon, 20 Jun 2016 20:45:03 +0000 (20:45 +0000)]
Merge "Make advanced storage option sticky..." into nyc-dev
Jim Miller [Mon, 20 Jun 2016 20:28:10 +0000 (13:28 -0700)]
Enable fingerprint nav by default
Fixes bug
29462383
Change-Id: Ia1cbd1d33ab3a11b5c8e5a770243d9b36448577b
Joe Fernandez [Mon, 20 Jun 2016 20:22:05 +0000 (20:22 +0000)]
Merge \"docs: Narnia 2 advertising language update\" into nyc-dev
am:
ebad16f3c0
Change-Id: Iafe2096dc792ff57a4a9065e88916c7ca7330e79
Joe Fernandez [Mon, 20 Jun 2016 20:13:08 +0000 (20:13 +0000)]
Merge "docs: Narnia 2 advertising language update" into nyc-dev
Adam Lesinski [Mon, 20 Jun 2016 19:55:37 +0000 (19:55 +0000)]
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
am:
c2e06a55f9
Change-Id: I4f590635c720ddbb6dfac292753606b9d3fe16e0
TreeHugger Robot [Mon, 20 Jun 2016 19:49:44 +0000 (19:49 +0000)]
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
OSDN Git Service
