OSDN Git Service
Dianne Hackborn [Wed, 2 Oct 2013 03:59:17 +0000 (20:59 -0700)]
am
d0ebb052: am
768dc8f7: Merge "Fix issue #
10948509: Crash in procstats when there is no data" into klp-dev
* commit '
d0ebb0520c64e717948d3bd98f0eb53c15828f94':
Alan Viverette [Wed, 2 Oct 2013 03:59:16 +0000 (20:59 -0700)]
am
1e33aac9: am
77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
* commit '
1e33aac9ef0a731b05297f87e7318a68d074c13b':
Amith Yamasani [Wed, 2 Oct 2013 03:59:15 +0000 (20:59 -0700)]
am
3a7eb5f1: am
c26f2615: am
8cfce5de: (-s ours) am
da0e4483: am
aad8d90c: am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
3a7eb5f1a8f1ef3821af41f45a75d8e29f58f57a':
Russell Brenner [Wed, 2 Oct 2013 03:59:15 +0000 (20:59 -0700)]
am
1bfd66c4: am
93e6a023: Merge "Set divider color for light theme" into klp-dev
* commit '
1bfd66c4482506fab36a5e1c130cf7b517e3e62d':
Martijn Coenen [Wed, 2 Oct 2013 03:59:14 +0000 (20:59 -0700)]
am
c432a712: am
86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev
* commit '
c432a712274833222e42629d88fcda865842ec55':
Svetoslav [Wed, 2 Oct 2013 03:59:13 +0000 (20:59 -0700)]
am
88cd02bb: am
8181c816: Merge "Add icons to the printer list items in settings." into klp-dev
* commit '
88cd02bbce36576b9402ee136fb87df4965a0d24':
Lifu Tang [Wed, 2 Oct 2013 03:59:12 +0000 (20:59 -0700)]
am
36f50e81: am
4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev
* commit '
36f50e81096c665ad112b39a143c1e91fd521c8a':
Lifu Tang [Wed, 2 Oct 2013 03:59:12 +0000 (20:59 -0700)]
am
0cdba449: am
2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev
* commit '
0cdba4493b7c5215ecf931255331455fdee882ce':
Dianne Hackborn [Wed, 2 Oct 2013 01:45:12 +0000 (18:45 -0700)]
am
768dc8f7: Merge "Fix issue #
10948509: Crash in procstats when there is no data" into klp-dev
* commit '
768dc8f7293356cdada32a13a476c7477f0bb126':
Fix issue #
10948509: Crash in procstats when there is no data
Dianne Hackborn [Tue, 1 Oct 2013 00:10:56 +0000 (17:10 -0700)]
am
768dc8f7: Merge "Fix issue #
10948509: Crash in procstats when there is no data" into klp-dev
* commit '
768dc8f7293356cdada32a13a476c7477f0bb126':
Fix issue #
10948509: Crash in procstats when there is no data
Alan Viverette [Tue, 1 Oct 2013 00:09:28 +0000 (17:09 -0700)]
am
77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
* commit '
77165f6d4bee9d367cb6e70a266645e1e755f3c6':
Restore default locale in Captioning Settings
Amith Yamasani [Tue, 1 Oct 2013 00:09:20 +0000 (17:09 -0700)]
am
c26f2615: am
8cfce5de: (-s ours) am
da0e4483: am
aad8d90c: am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
c26f2615964b648515c86cac08b492cee19b0747':
Make sure that external callers cannot pass in the confirm bypass extra
Russell Brenner [Tue, 1 Oct 2013 00:09:00 +0000 (17:09 -0700)]
am
93e6a023: Merge "Set divider color for light theme" into klp-dev
* commit '
93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea':
Set divider color for light theme
Martijn Coenen [Tue, 1 Oct 2013 00:08:54 +0000 (17:08 -0700)]
am
86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev
* commit '
86f74d2ad407214e23a717f2f24046ce9a89ea48':
Tap & pay: change empty state UX and strings.
Svetoslav [Tue, 1 Oct 2013 00:07:14 +0000 (17:07 -0700)]
am
8181c816: Merge "Add icons to the printer list items in settings." into klp-dev
* commit '
8181c8166f2dcd74fab0c422edf02e0ff7148fe5':
Add icons to the printer list items in settings.
Lifu Tang [Tue, 1 Oct 2013 00:06:52 +0000 (17:06 -0700)]
am
4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev
* commit '
4ba66781f30c7d96274bbf4b6395838495fea399':
Hacked to display Puzzle icon for GCore
Lifu Tang [Tue, 1 Oct 2013 00:06:51 +0000 (17:06 -0700)]
am
2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev
* commit '
2f78d82ab3a2858b3265cf01099db455fb43f4b1':
Don't show help menu when browser unavailable
Alan Viverette [Mon, 30 Sep 2013 21:17:19 +0000 (14:17 -0700)]
am
77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
* commit '
77165f6d4bee9d367cb6e70a266645e1e755f3c6':
Restore default locale in Captioning Settings
Amith Yamasani [Mon, 30 Sep 2013 21:17:12 +0000 (14:17 -0700)]
am
c26f2615: am
8cfce5de: (-s ours) am
da0e4483: am
aad8d90c: am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
c26f2615964b648515c86cac08b492cee19b0747':
Make sure that external callers cannot pass in the confirm bypass extra
Russell Brenner [Mon, 30 Sep 2013 21:16:45 +0000 (14:16 -0700)]
am
93e6a023: Merge "Set divider color for light theme" into klp-dev
* commit '
93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea':
Set divider color for light theme
Martijn Coenen [Mon, 30 Sep 2013 21:16:40 +0000 (14:16 -0700)]
am
86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev
* commit '
86f74d2ad407214e23a717f2f24046ce9a89ea48':
Tap & pay: change empty state UX and strings.
Svetoslav [Mon, 30 Sep 2013 21:13:49 +0000 (14:13 -0700)]
am
8181c816: Merge "Add icons to the printer list items in settings." into klp-dev
* commit '
8181c8166f2dcd74fab0c422edf02e0ff7148fe5':
Add icons to the printer list items in settings.
Lifu Tang [Mon, 30 Sep 2013 21:13:20 +0000 (14:13 -0700)]
am
4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev
* commit '
4ba66781f30c7d96274bbf4b6395838495fea399':
Hacked to display Puzzle icon for GCore
Lifu Tang [Mon, 30 Sep 2013 21:13:20 +0000 (14:13 -0700)]
am
2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev
* commit '
2f78d82ab3a2858b3265cf01099db455fb43f4b1':
Don't show help menu when browser unavailable
Dianne Hackborn [Mon, 30 Sep 2013 00:22:01 +0000 (00:22 +0000)]
Merge "Fix issue #
10948509: Crash in procstats when there is no data" into klp-dev
Dianne Hackborn [Mon, 30 Sep 2013 00:07:49 +0000 (17:07 -0700)]
Fix issue #
10948509: Crash in procstats when there is no data
Also make us much better about determining which app to blame for
a particular running process, organize the display of services by
their owning app, apply some new heuristics for deciding what goes
in the process list so that we can still display interesting processes
when we haven't collected pss data for them yet, etc.
Change-Id: I7e87225d3dabc66cf3ff020b5db48401b14aaf47
Alan Viverette [Fri, 27 Sep 2013 23:13:04 +0000 (23:13 +0000)]
Merge "Restore default locale in Captioning Settings" into klp-dev
Amith Yamasani [Fri, 27 Sep 2013 22:58:09 +0000 (15:58 -0700)]
am
8cfce5de: (-s ours) am
da0e4483: am
aad8d90c: am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
8cfce5de838fb9599b1040840f6bbe164bf9afdb':
Make sure that external callers cannot pass in the confirm bypass extra
Russell Brenner [Fri, 27 Sep 2013 22:41:33 +0000 (22:41 +0000)]
Merge "Set divider color for light theme" into klp-dev
Martijn Coenen [Fri, 27 Sep 2013 22:37:37 +0000 (22:37 +0000)]
Merge "Tap & pay: change empty state UX and strings." into klp-dev
Martijn Coenen [Fri, 27 Sep 2013 21:49:47 +0000 (14:49 -0700)]
Tap & pay: change empty state UX and strings.
Bug:
10965661
Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
Alan Viverette [Fri, 27 Sep 2013 19:22:34 +0000 (12:22 -0700)]
Restore default locale in Captioning Settings
BUG:
10967083
Change-Id: Id607a108d3d56a89fcecf345d2e12af88dc38690
Amith Yamasani [Fri, 27 Sep 2013 18:55:35 +0000 (11:55 -0700)]
am
da0e4483: am
aad8d90c: am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
da0e448379ff4bcc778fbbe1f203ec322378244f':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:51:16 +0000 (11:51 -0700)]
am
aad8d90c: am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
aad8d90ce082d01e6420227572891a2fce65306a':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:46:25 +0000 (11:46 -0700)]
am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
b4881f79e1c065b40f234710b6fb28acce9e164f':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:27:47 +0000 (11:27 -0700)]
am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
451d8225ef3ae407f52512a93bcf04e6400eb997':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:24:28 +0000 (11:24 -0700)]
am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
49187c9418dc2c5f404385596db3d82dd896c178':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:20:20 +0000 (11:20 -0700)]
am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
53a56ad89cbd14410dcd8e5755c6765f1a438928':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:18:04 +0000 (11:18 -0700)]
am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
447415f4f17dc91d3844394625f4e6fa10efedad':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:14:30 +0000 (11:14 -0700)]
am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
7870850387dabd32a54e3fca7d65dea5f45a9a16':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:10:37 +0000 (11:10 -0700)]
am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
77aa51e5b7261638590af1d69ac03f4c8cd25692':
Make sure that external callers cannot pass in the confirm bypass extra
Svetoslav [Fri, 27 Sep 2013 02:25:36 +0000 (02:25 +0000)]
Merge "Add icons to the printer list items in settings." into klp-dev
Svetoslav [Fri, 27 Sep 2013 01:55:31 +0000 (18:55 -0700)]
Add icons to the printer list items in settings.
bug:
10955751
Change-Id: Iea87a9a07624d6e26274030a51f912f8d2ef0e10
Lifu Tang [Fri, 27 Sep 2013 00:18:22 +0000 (00:18 +0000)]
Merge "Hacked to display Puzzle icon for GCore" into klp-dev
Lifu Tang [Fri, 27 Sep 2013 00:17:54 +0000 (00:17 +0000)]
Merge "Don't show help menu when browser unavailable" into klp-dev
Russell Brenner [Thu, 26 Sep 2013 23:07:52 +0000 (16:07 -0700)]
Set divider color for light theme
Bug:
10928581
Change-Id: I5586cae0ef2c49f5297f94bb7fb6ddede9d64b76
Svetoslav Ganov [Thu, 26 Sep 2013 21:18:21 +0000 (14:18 -0700)]
am
2a2fcdd6: am
bc2c3db8: Add print job settings screen.
* commit '
2a2fcdd6dbeee06af8acca7c76fbe905c862cbd4':
Add print job settings screen.
Svetoslav Ganov [Thu, 26 Sep 2013 21:14:55 +0000 (14:14 -0700)]
am
bc2c3db8: Add print job settings screen.
* commit '
bc2c3db8f923b9ee25345f5ebbad9f6c762a1e23':
Add print job settings screen.
Svetoslav Ganov [Mon, 23 Sep 2013 22:48:23 +0000 (15:48 -0700)]
Add print job settings screen.
Added a list of active print jobs to the main print settings
screen. Selecting a print job from there leads to a print job
settings screen with more information about the print job and
actions to change the prit job state such as cancel and restart.
bug:
10935736
Change-Id: Idd6826a998309941c3d8478dafe4b039c8ca4f45
Martijn Coenen [Thu, 26 Sep 2013 18:05:48 +0000 (11:05 -0700)]
am
01aa7930: am
077f83a2: Merge "Latest UX for Tap & pay." into klp-dev
* commit '
01aa7930306e15ba4ce942844506e42df85a0a04':
Latest UX for Tap & pay.
Lifu Tang [Thu, 26 Sep 2013 00:41:04 +0000 (17:41 -0700)]
Hacked to display Puzzle icon for GCore
- Fix b/
10856957
Change-Id: I0716c9f5c6d818cd38dfc30a6b0b29deaa994367
Martijn Coenen [Thu, 26 Sep 2013 18:00:49 +0000 (11:00 -0700)]
am
077f83a2: Merge "Latest UX for Tap & pay." into klp-dev
* commit '
077f83a22c3d9b8650b2ba4dab4f17e55fde59fb':
Latest UX for Tap & pay.
Martijn Coenen [Thu, 26 Sep 2013 17:57:47 +0000 (17:57 +0000)]
Merge "Latest UX for Tap & pay." into klp-dev
Mindy Pereira [Thu, 26 Sep 2013 17:52:26 +0000 (10:52 -0700)]
am
ff91e56f: am
873c3723: Merge "Updated de-blued backgrounds for settings power widget." into klp-dev
* commit '
ff91e56f8b17f4f986dd5512c3e7444875f2427f':
Updated de-blued backgrounds for settings power widget.
Mindy Pereira [Thu, 26 Sep 2013 17:50:51 +0000 (10:50 -0700)]
am
873c3723: Merge "Updated de-blued backgrounds for settings power widget." into klp-dev
* commit '
873c3723233f3fffd2ccd58041579bcd454d1e55':
Updated de-blued backgrounds for settings power widget.
Mindy Pereira [Thu, 26 Sep 2013 17:49:39 +0000 (17:49 +0000)]
Merge "Updated de-blued backgrounds for settings power widget." into klp-dev
Baligh Uddin [Thu, 26 Sep 2013 04:03:25 +0000 (04:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 26 Sep 2013 03:31:24 +0000 (20:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8dc4ee767b10e74fa862573130e163c3a451c152
Auto-generated-cl: translation import
Lifu Tang [Wed, 25 Sep 2013 23:50:46 +0000 (16:50 -0700)]
Don't show help menu when browser unavailable
- Fix b/
10860551
Change-Id: I71d073ef96d406f1705672d7ccf75337e5250ec6
Amith Yamasani [Wed, 25 Sep 2013 21:05:33 +0000 (14:05 -0700)]
Make sure that external callers cannot pass in the confirm bypass extra
Security fix for vulnerability where an app could launch into the screen lock
change dialog without first confirming the existing password/pattern.
Also, make sure that the fragments are launched with the correct corresponding
activity.
Bug:
9858403
Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564
Amith Yamasani [Wed, 25 Sep 2013 23:57:48 +0000 (16:57 -0700)]
am
d5e430b5: am
cb407569: Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev
* commit '
d5e430b59a991e5d8e54b20be896c07434d56954':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Wed, 25 Sep 2013 23:52:45 +0000 (16:52 -0700)]
am
cb407569: Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev
* commit '
cb407569b35d0605ffedfd6c00ee9a88c8da3aa4':
Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Wed, 25 Sep 2013 23:48:34 +0000 (23:48 +0000)]
Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev
Mindy Pereira [Wed, 25 Sep 2013 23:37:55 +0000 (16:37 -0700)]
Updated de-blued backgrounds for settings power widget.
Change-Id: I940999244d7bb6c2ec800c16b3c55c266d9b70c9
Martijn Coenen [Wed, 25 Sep 2013 00:31:25 +0000 (17:31 -0700)]
Latest UX for Tap & pay.
Bug:
10862185
Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
Amith Yamasani [Wed, 25 Sep 2013 21:05:33 +0000 (14:05 -0700)]
Make sure that external callers cannot pass in the confirm bypass extra
Security fix for vulnerability where an app could launch into the screen lock
change dialog without first confirming the existing password/pattern.
Also, make sure that the fragments are launched with the correct corresponding
activity.
Bug:
9858403
Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564
Rob Tsuk [Wed, 25 Sep 2013 21:00:52 +0000 (14:00 -0700)]
am
90a51e2b: am
e57248e5: Merge "Replace blue pressed feedback with gray." into klp-dev
* commit '
90a51e2bf9c61a80ebc79f6c9ad5e7b774860bfc':
Replace blue pressed feedback with gray.
Rob Tsuk [Wed, 25 Sep 2013 20:55:04 +0000 (13:55 -0700)]
am
e57248e5: Merge "Replace blue pressed feedback with gray." into klp-dev
* commit '
e57248e5f63172a5c78184ff9c885c823cb1dae8':
Replace blue pressed feedback with gray.
Rob Tsuk [Wed, 25 Sep 2013 20:52:04 +0000 (20:52 +0000)]
Merge "Replace blue pressed feedback with gray." into klp-dev
Rob Tsuk [Wed, 25 Sep 2013 20:16:59 +0000 (13:16 -0700)]
Replace blue pressed feedback with gray.
Change-Id: I03d5fbcd05975792dc27160d8ea44abdc1894624
Baligh Uddin [Wed, 25 Sep 2013 20:03:09 +0000 (13:03 -0700)]
am
c2314e32: (-s ours) am
083e6cc0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c2314e3229861a483b67b03dda2f9425b3b5cc68':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 20:01:48 +0000 (13:01 -0700)]
am
083e6cc0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
083e6cc01276ab4feb9bb060d4f830cddbccff69':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 19:58:58 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Brian Carlstrom [Wed, 25 Sep 2013 18:30:14 +0000 (11:30 -0700)]
am
594ffa25: am
372b6f74: Enable runtime selection for art for user builds
* commit '
594ffa25b068d79eaad43a1eb1636d79d508151a':
Enable runtime selection for art for user builds
Brian Carlstrom [Wed, 25 Sep 2013 18:28:35 +0000 (11:28 -0700)]
am
372b6f74: Enable runtime selection for art for user builds
* commit '
372b6f74b17fe1ef207bcda511dd71a93f792682':
Enable runtime selection for art for user builds
Brian Carlstrom [Thu, 12 Sep 2013 07:21:30 +0000 (00:21 -0700)]
Enable runtime selection for art for user builds
Bug:
10069754
Change-Id: I4b9780b52d3aac900e5d4da629e3e6b22c3cb323
Dave Burke [Wed, 25 Sep 2013 17:38:19 +0000 (10:38 -0700)]
am
f3a0ce28: am
64b28a0d: Disable AppOps for real.
* commit '
f3a0ce28ba5c276a74bbd76b44ce5d421aac4812':
Disable AppOps for real.
Dave Burke [Wed, 25 Sep 2013 17:35:03 +0000 (10:35 -0700)]
am
64b28a0d: Disable AppOps for real.
* commit '
64b28a0dcc174827e551f4c7e71e4268bd0f5bba':
Disable AppOps for real.
Dave Burke [Wed, 25 Sep 2013 16:56:58 +0000 (09:56 -0700)]
Disable AppOps for real.
Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1
Baligh Uddin [Wed, 25 Sep 2013 16:55:18 +0000 (09:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3d24fbbdc9140e85e5b5831a03b474641d3e871
Auto-generated-cl: translation import
Edward Jee [Tue, 24 Sep 2013 22:29:37 +0000 (15:29 -0700)]
am
1146695e: am
5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
* commit '
1146695e4b94dd3ea987f942ed8fd86d39a859ce':
Once the user allows PBAP phonebook access, do not ask again.
Edward Jee [Tue, 24 Sep 2013 22:26:23 +0000 (15:26 -0700)]
am
5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
* commit '
5ad8bf0700cf3297773617e14456d82bbc8f9585':
Once the user allows PBAP phonebook access, do not ask again.
Edward Jee [Tue, 24 Sep 2013 22:23:25 +0000 (22:23 +0000)]
Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
Amith Yamasani [Tue, 24 Sep 2013 22:05:02 +0000 (15:05 -0700)]
am
7dcd20f9: resolved conflicts for merge of
162b014c to klp-dev-plus-aosp
* commit '
7dcd20f9a6877342a92d0e42c1692a25429960f5':
Add Jakarta timezone
Amith Yamasani [Tue, 24 Sep 2013 21:59:11 +0000 (14:59 -0700)]
resolved conflicts for merge of
162b014c to klp-dev-plus-aosp
Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b
Amith Yamasani [Tue, 24 Sep 2013 21:49:54 +0000 (21:49 +0000)]
Merge "Add Jakarta timezone" into klp-dev
Baligh Uddin [Tue, 24 Sep 2013 21:35:21 +0000 (14:35 -0700)]
am
786f7eca: (-s ours) am
0865ffb3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
786f7eca41edbb4cca7b47b0937049751b345913':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 24 Sep 2013 21:30:17 +0000 (14:30 -0700)]
am
0865ffb3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
0865ffb32d84cdd26bf5136d496b129efbdfc4f1':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 24 Sep 2013 21:27:56 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 24 Sep 2013 21:27:51 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Christopher Tate [Tue, 24 Sep 2013 18:48:30 +0000 (11:48 -0700)]
am
c268bf37: am
254975aa: Merge "Use a generic icon for Home" into klp-dev
* commit '
c268bf379b3da1f29507f75fe8c9115b63acb3a8':
Use a generic icon for Home
Christopher Tate [Tue, 24 Sep 2013 18:46:11 +0000 (11:46 -0700)]
am
254975aa: Merge "Use a generic icon for Home" into klp-dev
* commit '
254975aac1e42997c2e068a623e7221470525ee1':
Use a generic icon for Home
Christopher Tate [Tue, 24 Sep 2013 18:44:14 +0000 (18:44 +0000)]
Merge "Use a generic icon for Home" into klp-dev
David Christie [Tue, 24 Sep 2013 17:24:54 +0000 (10:24 -0700)]
am
820816e0: am
4fff3d9b: Merge "Don\'t show background apps in Settings->Location (b/
10806272)" into klp-dev
* commit '
820816e02c6ff68eff5ae565410497e248f6cce3':
Don't show background apps in Settings->Location (b/
10806272)
Dianne Hackborn [Tue, 24 Sep 2013 17:24:53 +0000 (10:24 -0700)]
am
6be9bffa: am
88cf7709: Implement issue #
10895990: Better durations for proc stats
* commit '
6be9bffa6fb5ff3def3ed38dae61dc19f88c0185':
Implement issue #
10895990: Better durations for proc stats
David Christie [Tue, 24 Sep 2013 02:00:49 +0000 (19:00 -0700)]
am
4fff3d9b: Merge "Don\'t show background apps in Settings->Location (b/
10806272)" into klp-dev
* commit '
4fff3d9b9d3677383fe1eef9c067058a92fdc5b7':
Don't show background apps in Settings->Location (b/
10806272)
Dianne Hackborn [Tue, 24 Sep 2013 02:00:12 +0000 (19:00 -0700)]
am
88cf7709: Implement issue #
10895990: Better durations for proc stats
* commit '
88cf7709cb7ed829980cb8ddac3d5c7ac945d772':
Implement issue #
10895990: Better durations for proc stats
Jeff Sharkey [Tue, 24 Sep 2013 00:41:16 +0000 (17:41 -0700)]
Use a generic icon for Home
It's only a *foolish* consistency that is the hobgoblin of
little minds.
Bug
10849877
Change-Id: Ice60cbb13a754edc104ae8630cb3d8dfe637d1af
David Christie [Tue, 24 Sep 2013 00:18:39 +0000 (00:18 +0000)]
Merge "Don't show background apps in Settings->Location (b/
10806272)" into klp-dev
Sungmin Choi [Mon, 12 Aug 2013 19:19:58 +0000 (12:19 -0700)]
Add Jakarta timezone
Bug:
10198358
Change-Id: Id35bf1f3e137587016649815d879052d9f8409d9
OSDN Git Service
