OSDN Git Service
Jeff Sharkey [Wed, 30 Sep 2015 20:21:11 +0000 (20:21 +0000)]
am
58843059: am
e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev
* commit '
588430591b7bb5340ff02f05f1c02eaf924326ad':
Clean stale entries when deleting files.
Geoff Mendal [Wed, 30 Sep 2015 20:21:04 +0000 (20:21 +0000)]
am
a4a75803: (-s ours) am
a6bf0ebd: (-s ours) Import translations. DO NOT MERGE
* commit '
a4a758032537cceb47a0924b5082cb2197c5e446':
Import translations. DO NOT MERGE
Jeff Sharkey [Wed, 30 Sep 2015 20:11:17 +0000 (20:11 +0000)]
am
e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev
* commit '
e69ff2a878ee7635a467259995e2924fb96a3a72':
Clean stale entries when deleting files.
Geoff Mendal [Wed, 30 Sep 2015 20:11:13 +0000 (20:11 +0000)]
am
a6bf0ebd: (-s ours) Import translations. DO NOT MERGE
* commit '
a6bf0ebd6e7decda9ee02811cc5b73b96b9b9de5':
Import translations. DO NOT MERGE
Jeff Sharkey [Wed, 30 Sep 2015 16:20:40 +0000 (16:20 +0000)]
Merge "Clean stale entries when deleting files." into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 14:01:01 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22e6ce4ec3dd122bef49b23a26c9bc2d76980068
Auto-generated-cl: translation import
Diego Perez [Wed, 30 Sep 2015 09:29:40 +0000 (09:29 +0000)]
Merge "Reduce the amount of allocations on Paint_Delegate" into mnc-ub-dev
Diego Perez [Thu, 24 Sep 2015 13:52:59 +0000 (14:52 +0100)]
Reduce the amount of allocations on Paint_Delegate
When the text properties of the Paint object are updated, or when .set()
is called, updateFontObject will be called. This method is currently at the
top of the methods for number of allocations.
This CL reduces the number of calls to updateFontObject by a 90%,
reducing the number of Font allocations.
Change-Id: I3e232f9e6e230da8ecdd19921faadf2d3f4ff763
Deepanshu Gupta [Wed, 30 Sep 2015 00:45:52 +0000 (00:45 +0000)]
Merge "Support databinding in listitem layouts." into mnc-ub-dev
Deepanshu Gupta [Tue, 29 Sep 2015 01:03:18 +0000 (18:03 -0700)]
Support databinding in listitem layouts.
Add a wrapper around the PullParser to support stripping out databinding
parts.
Bug: http://b.android.com/187428
Change-Id: I88080d8f4108cb5ae27a137ad20c5dd7d516f3ea
Adam Lesinski [Tue, 29 Sep 2015 23:39:08 +0000 (23:39 +0000)]
am
8197e2de: am
ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
* commit '
8197e2de06bb96b0076469528a44b36a080ec9e1':
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Adam Lesinski [Tue, 29 Sep 2015 23:30:27 +0000 (23:30 +0000)]
am
ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
* commit '
ffc6ce000568c08a50f7b538bd4cd7729e64c229':
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Adam Lesinski [Tue, 29 Sep 2015 23:22:59 +0000 (23:22 +0000)]
Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
Bill Rassieur [Mon, 28 Sep 2015 23:15:24 +0000 (23:15 +0000)]
am
3de2d53a: am
c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
* commit '
3de2d53a75ed66ee3e64412adfb77ff5a729b43a':
Fix jank: Don't write lockout deadline if not needed
Bill Rassieur [Mon, 28 Sep 2015 23:09:10 +0000 (23:09 +0000)]
am
c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
* commit '
c25d546050423845c42a5e8cc8e356caa1f4f71a':
Fix jank: Don't write lockout deadline if not needed
Bill Rassieur [Mon, 28 Sep 2015 23:02:46 +0000 (23:02 +0000)]
Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev
Jorim Jaggi [Mon, 28 Sep 2015 20:57:37 +0000 (13:57 -0700)]
Fix jank: Don't write lockout deadline if not needed
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.
Bug:
24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
Adam Lesinski [Mon, 28 Sep 2015 17:21:33 +0000 (10:21 -0700)]
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Bug:
24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
Billy Lau [Mon, 28 Sep 2015 17:38:08 +0000 (17:38 +0000)]
am
cb4bafb4: am
86e153d5: am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
cb4bafb4c97dc5e73b055ae1c0e4a548068062cd':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:31:48 +0000 (17:31 +0000)]
am
86e153d5: am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
86e153d5f0614c9f3da137fd0b815a398598928b':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:24:25 +0000 (17:24 +0000)]
am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
f360bbca969f60ee968240d22bc0b1f1e5e17218':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:18:30 +0000 (17:18 +0000)]
Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
Jae Seo [Mon, 28 Sep 2015 17:17:00 +0000 (17:17 +0000)]
Merge "docs: fix a wrong link" into mnc-ub-dev
Adam Lesinski [Mon, 28 Sep 2015 07:06:55 +0000 (07:06 +0000)]
am
d913782f: am
d5f10154: Bump BatteryStats version
* commit '
d913782f1b48e1ef5928f869279c541e023d1cb7':
Bump BatteryStats version
Adam Lesinski [Mon, 28 Sep 2015 07:00:52 +0000 (07:00 +0000)]
am
d5f10154: Bump BatteryStats version
* commit '
d5f10154c772b925f6527e25aeb8461de8c710cd':
Bump BatteryStats version
Baligh Uddin [Sun, 27 Sep 2015 22:37:45 +0000 (22:37 +0000)]
am
a9abcc43: (-s ours) am
edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a9abcc43ae71b907e6944ec0710834ef56801145':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 22:37:39 +0000 (22:37 +0000)]
am
4ac4ba5d: (-s ours) am
0307a2a6: (-s ours) Import translations. DO NOT MERGE
* commit '
4ac4ba5d1295b31a759609fd1e495cbf5e18ea64':
Import translations. DO NOT MERGE
Adam Lesinski [Sun, 27 Sep 2015 21:24:49 +0000 (21:24 +0000)]
Bump BatteryStats version
Bug:
24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
Baligh Uddin [Sun, 27 Sep 2015 20:55:44 +0000 (20:55 +0000)]
am
edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
edd35f922c492bb23d266c54e9c69505d3539680':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 20:55:40 +0000 (20:55 +0000)]
am
0307a2a6: (-s ours) Import translations. DO NOT MERGE
* commit '
0307a2a68dd4afceb480d1d0fdc792690ad88df7':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 04:05:09 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 26 Sep 2015 20:05:11 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibaf19bf407113bcedc96d367a80b3a7b1999f7c5
Auto-generated-cl: translation import
Baligh Uddin [Sat, 26 Sep 2015 19:34:51 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I349825f72d9e929562abd599816a4ae428112ea6
Auto-generated-cl: translation import
Bryce Lee [Sat, 26 Sep 2015 02:48:18 +0000 (02:48 +0000)]
am
24e5efda: Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev
* commit '
24e5efda0509871d2a7a779739cce5264de68459':
Add additional broadcast for when a phone account is unregistered.
Bryce Lee [Sat, 26 Sep 2015 02:41:50 +0000 (02:41 +0000)]
Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev
Bryce Lee [Sat, 26 Sep 2015 01:41:22 +0000 (01:41 +0000)]
am
f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
* commit '
f0740e0a2e51d2cb9b6e9ea7fbd251bfa9b2a0ad':
Add ThermalObserver system service to capture thermal state uevents.
Bryce Lee [Sat, 26 Sep 2015 01:33:00 +0000 (01:33 +0000)]
Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
Bryce Lee [Fri, 25 Sep 2015 23:43:01 +0000 (16:43 -0700)]
Add ThermalObserver system service to capture thermal state uevents.
Bug:
21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
Adrian Roos [Fri, 25 Sep 2015 23:36:15 +0000 (23:36 +0000)]
am
1a6f9216: am
896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev
* commit '
1a6f9216f49f6392d33fc30cee7e1ccbca93c081':
Show charging speed when time to full is available
Adrian Roos [Fri, 25 Sep 2015 23:27:59 +0000 (23:27 +0000)]
am
896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev
* commit '
896b9c6261641e285bc37c4d22a589b01ce11ffe':
Show charging speed when time to full is available
Adrian Roos [Fri, 25 Sep 2015 23:23:26 +0000 (23:23 +0000)]
Merge "Show charging speed when time to full is available" into mnc-dr-dev
Adrian Roos [Thu, 24 Sep 2015 00:03:47 +0000 (17:03 -0700)]
Show charging speed when time to full is available
Only shows if translation is available, follow-up
I3e883eeca002e86d4df30c2b238e18bd63bbddea to show in
all locales.
Bug:
24167496
Change-Id: I667cde69e5d5f8aec8ac9fd105bbfb7e118ced64
Nick Vaccaro [Fri, 25 Sep 2015 21:44:26 +0000 (21:44 +0000)]
am
faf3f370: Merge "Fix sensor usage model" into cw-e-dev
* commit '
faf3f3706140c3b90c805e77c3c72c0978b0d61a':
Fix sensor usage model
Nick Vaccaro [Fri, 25 Sep 2015 21:36:14 +0000 (21:36 +0000)]
Merge "Fix sensor usage model" into cw-e-dev
Ned Burns [Fri, 25 Sep 2015 21:20:08 +0000 (21:20 +0000)]
am
1b69fcbf: am
f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit '
1b69fcbf810a805a0fa3dbfc6a3d7cc49d87f33e':
Kill ActivityView's background thread when it's destroyed
Ned Burns [Fri, 25 Sep 2015 21:10:09 +0000 (21:10 +0000)]
am
f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit '
f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
Kill ActivityView's background thread when it's destroyed
Nick Vaccaro [Fri, 18 Sep 2015 00:22:44 +0000 (17:22 -0700)]
Fix sensor usage model
Changed to use the correct API based on the reporting type of the
chosen sensor. The code was incorrectly treating the WRIST TILT
sensor as a one-shot sensor instead of a special-reporting sensor.
Bug:
11661021
Change-Id: Ib8b7ef5bad9642773f4c0e22e218fbec8c34439b
Jae Seo [Fri, 25 Sep 2015 19:50:08 +0000 (12:50 -0700)]
docs: fix a wrong link
Change-Id: Ib60dfb5a4c9ac8138a357af492f55ca27a7466f6
Jeff Sharkey [Fri, 25 Sep 2015 01:15:13 +0000 (18:15 -0700)]
Clean stale entries when deleting files.
When deleting files directly from external storage devices, remove
any matching entries from MediaStore so we don't end up showing
stale entries to clients, such as MTP/PTP.
Also handles the case where an entire directory is deleted.
Bug:
24045921
Change-Id: I802470fa1aa03e0bec147ea113f1a49e26a0f3f9
Gus Prevas [Fri, 25 Sep 2015 17:24:39 +0000 (17:24 +0000)]
am
b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
* commit '
b17d1e5e6aa53f5925efc2135b9a603a9a0ed2df':
Adds an option to override RemoteViews transition.
Gus Prevas [Fri, 25 Sep 2015 17:17:44 +0000 (17:17 +0000)]
Merge "Adds an option to override RemoteViews transition." into cw-e-dev
Ian Pedowitz [Fri, 25 Sep 2015 17:17:25 +0000 (17:17 +0000)]
am
3af6163a: am
31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
* commit '
3af6163a66dceb7a6e6e300f5f8de828c88919d4':
Give the DhcpClient alarm broadcasts foreground priority.
Gus Prevas [Thu, 17 Sep 2015 21:34:46 +0000 (17:34 -0400)]
Adds an option to override RemoteViews transition.
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches. If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.
Bug:
23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
Ian Pedowitz [Fri, 25 Sep 2015 17:10:33 +0000 (17:10 +0000)]
am
31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
* commit '
31fe464d50bcd4360ac004d44d6938eac762d78d':
Give the DhcpClient alarm broadcasts foreground priority.
Ian Pedowitz [Fri, 25 Sep 2015 17:04:14 +0000 (17:04 +0000)]
Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
Joe LaPenna [Fri, 25 Sep 2015 09:40:15 +0000 (09:40 +0000)]
am
ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
* commit '
ac342d3831991060c1ccac26aaa764e0a9ae7e15':
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
Joe LaPenna [Fri, 25 Sep 2015 08:53:34 +0000 (08:53 +0000)]
Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
Joe LaPenna [Fri, 25 Sep 2015 08:29:55 +0000 (01:29 -0700)]
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
BUG:
23753686
Change-Id: Ia75046df38ebb8630e1b5ea1709bfe63eb8f177e
Jorim Jaggi [Fri, 25 Sep 2015 07:11:24 +0000 (07:11 +0000)]
am
31519f63: am
ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
* commit '
31519f637d3373ff8546360742a4b05706f0ad61':
Do not issue config change command when not needed
Jorim Jaggi [Fri, 25 Sep 2015 07:02:08 +0000 (07:02 +0000)]
am
ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
* commit '
ea9675e7aa11219d426a3c0ab3929ea16a34a4c7':
Do not issue config change command when not needed
Jorim Jaggi [Fri, 25 Sep 2015 06:54:42 +0000 (06:54 +0000)]
Merge "Do not issue config change command when not needed" into mnc-dr-dev
Pankaj Kanwar [Fri, 25 Sep 2015 04:51:38 +0000 (04:51 +0000)]
am
f99986ee: am
65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
* commit '
f99986eec6a263e74833d26dc8dcb107b15a9c04':
AudioService: cleanup sco audio mode upon disconnection.
Pankaj Kanwar [Fri, 25 Sep 2015 04:45:52 +0000 (04:45 +0000)]
am
65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
* commit '
65bfe1cac3297d3d4463db753c0397f28c872637':
AudioService: cleanup sco audio mode upon disconnection.
Pankaj Kanwar [Fri, 25 Sep 2015 04:40:23 +0000 (04:40 +0000)]
Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
Lorenzo Colitti [Fri, 25 Sep 2015 03:54:06 +0000 (12:54 +0900)]
Give the DhcpClient alarm broadcasts foreground priority.
Bug:
24265658
Bug:
24224067
Change-Id: I375097e7957643efb4bc0bb81318b13d9b9c82c1
Baligh Uddin [Fri, 25 Sep 2015 03:11:40 +0000 (03:11 +0000)]
am
437ee52a: (-s ours) am
2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
437ee52a65e609ffce91aff8eff438ebc73d9105':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:34 +0000 (03:11 +0000)]
am
56c2f8ee: (-s ours) am
4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
56c2f8eefb7100ddc8850ccf744a7bc55e8d295d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:26 +0000 (03:11 +0000)]
am
6a39ee4d: (-s ours) am
9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
6a39ee4db5f81795cbbfce0c2a864d619e860d88':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:16 +0000 (03:11 +0000)]
am
683db030: (-s ours) am
9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
683db0306cfd756ff96fabbd0de07fa8b0184483':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:16 +0000 (03:05 +0000)]
am
2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
2f09d2a999edfba173771ab020b87eca7ec7ef26':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:12 +0000 (03:05 +0000)]
am
4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4ee34138c03dee1fd248046b135d9b4bcd84efdd':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:08 +0000 (03:05 +0000)]
am
9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
9db221c88c678419b1c6ac7cd8223b37cd2a43a4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:04 +0000 (03:05 +0000)]
am
9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
9b1c6f7781fba239c1636a418a9678c8b3e53896':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 02:58:40 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:57:21 +0000 (02:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:56:40 +0000 (02:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:56:35 +0000 (02:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:36:51 +0000 (19:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iac1fe89a00d3f4e30b20e8f07c48a0845ce41d81
Auto-generated-cl: translation import
Eric Laurent [Fri, 25 Sep 2015 01:41:48 +0000 (18:41 -0700)]
AudioService: cleanup sco audio mode upon disconnection.
Clean up SCO forced usage and A2DP suspend state upon
SCO device or profile disconnection.
This is in case the Bluetooth Headset service does not
do it.
Bug:
24316765.
Change-Id: Ifc0305607c186be49b2eb42b7868647292e56137
Baligh Uddin [Fri, 25 Sep 2015 01:40:38 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50eeba5466bb054212dc51f8a8d1b5b76f56a31d
Auto-generated-cl: translation import
Jorim Jaggi [Fri, 25 Sep 2015 01:38:07 +0000 (01:38 +0000)]
am
b7b9b31f: am
ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit '
b7b9b31f6969dc48174757ec236622f8d49222d0':
Deliver camera launch source for analytics
Jorim Jaggi [Fri, 25 Sep 2015 00:35:58 +0000 (17:35 -0700)]
Do not issue config change command when not needed
This caused a but where WindowManager was blocked on this to perform a
layout, leading to delays in screen wake-ups.
Bug:
24383169
Change-Id: I42bc08dae9057060f09c301328bb4839a970c597
Jorim Jaggi [Fri, 25 Sep 2015 01:30:43 +0000 (01:30 +0000)]
am
ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit '
ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
Deliver camera launch source for analytics
Jorim Jaggi [Fri, 25 Sep 2015 01:27:05 +0000 (01:27 +0000)]
Merge "Deliver camera launch source for analytics" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 01:12:20 +0000 (18:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45388638f08ea212ddb1f15716a4020c3abc761c
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 01:10:14 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebbf559a27c2c55ec7f172ad7e6592e86452edff
Auto-generated-cl: translation import
Michael Lentine [Fri, 25 Sep 2015 00:48:02 +0000 (00:48 +0000)]
am
8c743655: am
cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
* commit '
8c7436558fa61b5ce9e82116b6b385f8f246d87e':
Revert "Dismiss color fade when it is no longer used."
Michael Lentine [Fri, 25 Sep 2015 00:40:39 +0000 (00:40 +0000)]
am
cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
* commit '
cb13da9772b41c3466c3ed514e6321c2cfb85c2a':
Revert "Dismiss color fade when it is no longer used."
Michael Lentine [Fri, 25 Sep 2015 00:31:24 +0000 (00:31 +0000)]
Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
Michael Lentine [Thu, 24 Sep 2015 23:58:46 +0000 (16:58 -0700)]
Revert "Dismiss color fade when it is no longer used."
Bug:
24371570
This reverts commit
193560002fbc080f0006df088f8f5e9c165bfd78.
Adrian Roos [Thu, 24 Sep 2015 23:59:45 +0000 (23:59 +0000)]
am
a4150f49: am
f02ba4b8: am
09945c0b: am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
a4150f49d031d431a7bdcc1cdedbffc4d3e312a5':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:50:09 +0000 (23:50 +0000)]
am
f02ba4b8: am
09945c0b: am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
f02ba4b8ffc44ccbb94ebcf1b70b77fc06af83d4':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:40:43 +0000 (23:40 +0000)]
am
09945c0b: am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
09945c0bdef5acf8276d433a96de3a5589b2de86':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Jorim Jaggi [Wed, 23 Sep 2015 19:59:22 +0000 (12:59 -0700)]
Deliver camera launch source for analytics
Bug:
24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
Adrian Roos [Thu, 24 Sep 2015 23:32:01 +0000 (23:32 +0000)]
am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:25:48 +0000 (23:25 +0000)]
am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:11:55 +0000 (23:11 +0000)]
am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
f6c7515817f9a4c24d2ff9baba2f916795862098':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 22:59:37 +0000 (22:59 +0000)]
am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 22:49:19 +0000 (22:49 +0000)]
am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 22:39:23 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
OSDN Git Service
