OSDN Git Service
Jeff Sharkey [Tue, 2 Oct 2012 21:02:21 +0000 (14:02 -0700)]
am
d8d8a200: am
6258a0e2: Merge "Migrate telephony settings to Global." into jb-mr1-dev
* commit '
d8d8a2002aaf791285cd68368dba010c65a6743b':
Migrate telephony settings to Global.
Jeff Sharkey [Tue, 2 Oct 2012 21:00:18 +0000 (14:00 -0700)]
am
6258a0e2: Merge "Migrate telephony settings to Global." into jb-mr1-dev
* commit '
6258a0e22ed82f8fcc80e50ffda058ebcaf177e1':
Migrate telephony settings to Global.
Jeff Sharkey [Tue, 2 Oct 2012 20:57:59 +0000 (13:57 -0700)]
Merge "Migrate telephony settings to Global." into jb-mr1-dev
Daniel Sandler [Tue, 2 Oct 2012 17:56:25 +0000 (10:56 -0700)]
am
f94b8de1: am
42312b47: Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
* commit '
f94b8de1cdd0f149f5abd11177ce4a59ff7db0c1':
Support new ACTION_QUICK_CLOCK.
Daniel Sandler [Tue, 2 Oct 2012 17:53:02 +0000 (10:53 -0700)]
am
42312b47: Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
* commit '
42312b47926809a7042e2db5aec945417e11f53f':
Support new ACTION_QUICK_CLOCK.
Daniel Sandler [Tue, 2 Oct 2012 17:49:51 +0000 (10:49 -0700)]
Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
The Android Open Source Project [Tue, 2 Oct 2012 16:20:26 +0000 (09:20 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I31f2c7e4ec4673e7b360ba4abc94b4138cb135d8
Chris Wren [Tue, 2 Oct 2012 15:51:54 +0000 (08:51 -0700)]
am
5ed6f3ce: am
23a5fbbd: renaming Sleep Mode feature.
* commit '
5ed6f3ce4ad26577135c42e28177df32eaaf33a3':
renaming Sleep Mode feature.
Chris Wren [Tue, 2 Oct 2012 15:50:30 +0000 (08:50 -0700)]
am
23a5fbbd: renaming Sleep Mode feature.
* commit '
23a5fbbdf4c0b4bb815fff69a20598dcb3588080':
renaming Sleep Mode feature.
Chris Wren [Tue, 2 Oct 2012 13:42:39 +0000 (09:42 -0400)]
renaming Sleep Mode feature.
Bug:
7212796
Bug:
7267485
Change-Id: I28b94bc53d7bf1bac4d7d1de6e6ed74c850ff8c3
The Android Automerger [Tue, 2 Oct 2012 14:00:11 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Tue, 2 Oct 2012 06:35:57 +0000 (23:35 -0700)]
am
2765d3b7: am
1e230b40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2765d3b7658ac3dcb455628fab41479fe4fb24cb':
Import translations. DO NOT MERGE
Svetoslav Ganov [Tue, 2 Oct 2012 06:35:55 +0000 (23:35 -0700)]
am
b5d735f1: am
f26263fd: Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
* commit '
b5d735f11085ae85ad768af03972809f444e1b0b':
Upading the strings for accessibility multi-user.
Baligh Uddin [Tue, 2 Oct 2012 06:32:51 +0000 (23:32 -0700)]
am
1e230b40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
1e230b4087cc923ab756d09a00eb754874f6bf92':
Import translations. DO NOT MERGE
Svetoslav Ganov [Tue, 2 Oct 2012 06:32:49 +0000 (23:32 -0700)]
am
f26263fd: Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
* commit '
f26263fdb7a639fe5de49e8f01576e8d4c6be7f6':
Upading the strings for accessibility multi-user.
Baligh Uddin [Tue, 2 Oct 2012 06:31:24 +0000 (23:31 -0700)]
am
90fd08b8: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
90fd08b8ec5570017fdae958b97d42675a75c2ee':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 05:22:38 +0000 (22:22 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 2 Oct 2012 05:20:28 +0000 (22:20 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Svetoslav Ganov [Tue, 2 Oct 2012 04:17:18 +0000 (21:17 -0700)]
Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
Svetoslav Ganov [Tue, 2 Oct 2012 01:41:25 +0000 (18:41 -0700)]
Upading the strings for accessibility multi-user.
bug:
7255486
Change-Id: I775165896124a6fde3684d0f302a90396ce19d2e
Baligh Uddin [Mon, 1 Oct 2012 22:34:23 +0000 (15:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I117727baf42a812b608c5931ad76cf9f70ff0c9e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 1 Oct 2012 22:32:43 +0000 (15:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I576f2a4c47da5f4796042ffacfaa6cc3835e8075
Auto-generated-cl: translation import
Adam Powell [Mon, 1 Oct 2012 21:57:23 +0000 (14:57 -0700)]
am
d7be24f6: am
7474bc3d: Move the installed app details overflow button to the top.
* commit '
d7be24f68a8104703775a196f0f2dd7fec5ba405':
Move the installed app details overflow button to the top.
Adam Powell [Mon, 1 Oct 2012 21:55:00 +0000 (14:55 -0700)]
am
7474bc3d: Move the installed app details overflow button to the top.
* commit '
7474bc3dc2461d33dcdcaf5595635ac33e6e3979':
Move the installed app details overflow button to the top.
Adam Powell [Mon, 1 Oct 2012 01:21:14 +0000 (18:21 -0700)]
Move the installed app details overflow button to the top.
It looks ridiculous down by itself on a split action bar.
Bug
7258991
Change-Id: I4c373e1e154a793384a14e9622707ad464c1b1ca
Jeff Sharkey [Mon, 1 Oct 2012 20:39:24 +0000 (13:39 -0700)]
Migrate telephony settings to Global.
Bug:
7231764
Change-Id: Ic28dacda8372b7976b5aa36be82e98e5ad069f9a
Daniel Sandler [Mon, 1 Oct 2012 20:45:10 +0000 (16:45 -0400)]
Support new ACTION_QUICK_CLOCK.
See change Ic561dbeb.
Bug:
7264806
Change-Id: I8439f2c25614ef794e43f85196d3f95c188e8cce
Baligh Uddin [Mon, 1 Oct 2012 17:24:24 +0000 (10:24 -0700)]
am
5dde6f06: am
fd94d51e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5dde6f06b8297e98eaed55e523dfeca4f4d7e558':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 17:24:21 +0000 (10:24 -0700)]
am
070760b0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
070760b06592de6e5b39cce9e1bfb34ee20c4d23':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 17:17:37 +0000 (10:17 -0700)]
am
fd94d51e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
fd94d51e945273a942947433aed828884bbaa17f':
Import translations. DO NOT MERGE
rich cannings [Mon, 1 Oct 2012 17:16:18 +0000 (10:16 -0700)]
am
e88c4bab: am
82988b48: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
* commit '
e88c4bab2ee4fcefe431414f7eb64ae2c56ef022':
Add Help lin to Settings > Security
Amith Yamasani [Mon, 1 Oct 2012 17:16:07 +0000 (10:16 -0700)]
am
1035e199: am
2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
* commit '
1035e19941e7b51ea5044e34b4b03abd1017f50e':
Make Settings shortcuts launch into the correct activity/fragment.
Baligh Uddin [Mon, 1 Oct 2012 17:15:55 +0000 (10:15 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 1 Oct 2012 17:15:17 +0000 (10:15 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Dianne Hackborn [Mon, 1 Oct 2012 17:13:29 +0000 (10:13 -0700)]
am
d26005ea: am
1a47ecd9: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
d26005ea8569da03bbb30601e28ba3c139ae6b06':
Fix issue #
7255954: API Review: rename Dream to DreamService
The Android Automerger [Mon, 1 Oct 2012 01:17:55 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
rich cannings [Sun, 30 Sep 2012 22:51:24 +0000 (15:51 -0700)]
am
82988b48: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
* commit '
82988b4871bd318d16aeb13947c7388eb1c5f195':
Add Help lin to Settings > Security
rich cannings [Sun, 30 Sep 2012 22:48:54 +0000 (15:48 -0700)]
Merge "Add Help lin to Settings > Security" into jb-mr1-dev
rich cannings [Sun, 30 Sep 2012 20:54:26 +0000 (13:54 -0700)]
Add Help lin to Settings > Security
Bug:
7210077
Change-Id: I1010356e27d85006e7d7dc62d935b67f53ccde12
Amith Yamasani [Sun, 30 Sep 2012 21:42:53 +0000 (14:42 -0700)]
am
2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
* commit '
2485d9fc5113e7a886ae5b59e535905b0f210fa4':
Make Settings shortcuts launch into the correct activity/fragment.
Amith Yamasani [Sun, 30 Sep 2012 21:41:11 +0000 (14:41 -0700)]
Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
Amith Yamasani [Fri, 28 Sep 2012 23:40:42 +0000 (16:40 -0700)]
Make Settings shortcuts launch into the correct activity/fragment.
Bug:
6959454
Change the task affinities so that the shortcuts are not tied to
Settings main task.
Change-Id: I7729d17d8144a4a57f0d135fe80bdbd7af8dad01
The Android Automerger [Sun, 30 Sep 2012 14:00:11 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dianne Hackborn [Sat, 29 Sep 2012 01:22:27 +0000 (18:22 -0700)]
am
1a47ecd9: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
1a47ecd9269ff28bec71592b8c3d9a857ac49967':
Fix issue #
7255954: API Review: rename Dream to DreamService
Dianne Hackborn [Sat, 29 Sep 2012 01:18:21 +0000 (18:18 -0700)]
Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
Dianne Hackborn [Sat, 29 Sep 2012 01:02:15 +0000 (18:02 -0700)]
Fix issue #
7255954: API Review: rename Dream to DreamService
Change-Id: Ic374130cb37cbbfad0421089aecf30de87c4d369
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:15:36 +0000 (17:15 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I32058e2adca0ba7caf9a6f562c690ca5b68ddeb1
Robert Greenwalt [Sat, 29 Sep 2012 00:09:56 +0000 (17:09 -0700)]
am
a59cc272: Merge "Colorize premium sms ui." into jb-mr1-dev
* commit '
a59cc2722e6dd3cdc50e27c9564d4da37c952cf6':
Colorize premium sms ui.
Svetoslav Ganov [Sat, 29 Sep 2012 00:06:43 +0000 (17:06 -0700)]
am
a59f1aac: Setting to enable the global gesture for turning on accessibility.
* commit '
a59f1aacc0b55a301ce8b36498f79c9f589c5f20':
Setting to enable the global gesture for turning on accessibility.
Robert Greenwalt [Fri, 28 Sep 2012 23:55:32 +0000 (16:55 -0700)]
am
a59cc272: Merge "Colorize premium sms ui." into jb-mr1-dev
* commit '
a59cc2722e6dd3cdc50e27c9564d4da37c952cf6':
Colorize premium sms ui.
Robert Greenwalt [Fri, 28 Sep 2012 23:54:03 +0000 (16:54 -0700)]
Merge "Colorize premium sms ui." into jb-mr1-dev
Svetoslav Ganov [Fri, 28 Sep 2012 22:51:50 +0000 (15:51 -0700)]
am
a59f1aac: Setting to enable the global gesture for turning on accessibility.
* commit '
a59f1aacc0b55a301ce8b36498f79c9f589c5f20':
Setting to enable the global gesture for turning on accessibility.
Svetoslav Ganov [Thu, 27 Sep 2012 23:04:54 +0000 (16:04 -0700)]
Setting to enable the global gesture for turning on accessibility.
1. Adding a setting to enable the gesture to turn on accessibility.
This is a new screen with a toggle switch similarly as screen
magnification which will contain explanation of how to perform
the gesture.
bug:
6171929
Change-Id: I84dfa46a9b7b789d99923684e08e52cf7d236eb2
Russell Brenner [Thu, 27 Sep 2012 18:37:54 +0000 (11:37 -0700)]
Show warnings when skipping Wi-Fi connection
If user skips over Wi-Fi, warn about possible carrier data charges or
inability to receive updates, depending on whether or not phone
service is available.
Note to translators: Some strings are being moved here from setup
wizard. They're tagged with their msgid's so as not to trigger
retranslation.
Bug:
7211786
Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
Jean-Baptiste Queru [Fri, 28 Sep 2012 20:49:56 +0000 (13:49 -0700)]
Merge remote-tracking branch 'goog/jb-mr1-aah-dev' into HEAD
Russell Brenner [Fri, 28 Sep 2012 19:52:14 +0000 (12:52 -0700)]
am
88c9f288: Show warnings when skipping Wi-Fi connection
* commit '
88c9f2889fafb53a2875418317ecd197d9aae883':
Show warnings when skipping Wi-Fi connection
Russell Brenner [Fri, 28 Sep 2012 19:50:55 +0000 (12:50 -0700)]
am
88c9f288: Show warnings when skipping Wi-Fi connection
* commit '
88c9f2889fafb53a2875418317ecd197d9aae883':
Show warnings when skipping Wi-Fi connection
Baligh Uddin [Fri, 28 Sep 2012 19:40:54 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib65119cb5455e20a3a10ff0a45f54aa0d819d8ec
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 19:38:50 +0000 (12:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9801833688c9dfc5e8ac238da034d17974ad6823
Auto-generated-cl: translation import
Russell Brenner [Thu, 27 Sep 2012 18:37:54 +0000 (11:37 -0700)]
Show warnings when skipping Wi-Fi connection
If user skips over Wi-Fi, warn about possible carrier data charges or
inability to receive updates, depending on whether or not phone
service is available.
Note to translators: Some strings are being moved here from setup
wizard. They're tagged with their msgid's so as not to trigger
retranslation.
Bug:
7211786
Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
The Android Automerger [Fri, 28 Sep 2012 13:59:56 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Fri, 28 Sep 2012 07:03:09 +0000 (00:03 -0700)]
am
990c5f24: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
* commit '
990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c':
Bring up new user setup dialog when tapping on new user
Amith Yamasani [Fri, 28 Sep 2012 07:02:54 +0000 (00:02 -0700)]
am
990c5f24: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
* commit '
990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c':
Bring up new user setup dialog when tapping on new user
Amith Yamasani [Fri, 28 Sep 2012 07:00:53 +0000 (00:00 -0700)]
Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
Baligh Uddin [Fri, 28 Sep 2012 06:49:03 +0000 (23:49 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 28 Sep 2012 06:44:46 +0000 (23:44 -0700)]
am
ec4a1520: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
ec4a152071fb9e3dcdf00eec2444afc6df800540':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 06:44:42 +0000 (23:44 -0700)]
am
ec4a1520: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
ec4a152071fb9e3dcdf00eec2444afc6df800540':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 06:41:51 +0000 (23:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 28 Sep 2012 06:40:16 +0000 (23:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc3aa0738b4f2beccdc05c1c225ff60308def5d4
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 06:38:37 +0000 (23:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I38fbd0c22b6056e9c089425511481e6c4b1dacac
Auto-generated-cl: translation import
rich cannings [Fri, 28 Sep 2012 06:13:57 +0000 (23:13 -0700)]
am
4f64951c: Merge "Developer setting to skip Package Verification" into jb-mr1-dev
* commit '
4f64951cb89c5da82fdbba3c02bccf0f3500c2a7':
Developer setting to skip Package Verification
rich cannings [Fri, 28 Sep 2012 06:13:19 +0000 (23:13 -0700)]
am
4f64951c: Merge "Developer setting to skip Package Verification" into jb-mr1-dev
* commit '
4f64951cb89c5da82fdbba3c02bccf0f3500c2a7':
Developer setting to skip Package Verification
rich cannings [Fri, 28 Sep 2012 06:11:50 +0000 (23:11 -0700)]
Merge "Developer setting to skip Package Verification" into jb-mr1-dev
Amith Yamasani [Fri, 28 Sep 2012 06:01:35 +0000 (23:01 -0700)]
Bring up new user setup dialog when tapping on new user
Bug:
7245796
Also fix a few strings that changed and other UI tweaks to conform
to spec document.
Change-Id: If4409459b20ec8c8ece69b6c23c8ab49b0ca0cac
Jeff Sharkey [Fri, 28 Sep 2012 02:33:35 +0000 (19:33 -0700)]
am
cc24aa2b: Merge "Follow more Secure settings to Global." into jb-mr1-dev
* commit '
cc24aa2b1f58236867a4e0c326e5ce4197df55d8':
Follow more Secure settings to Global.
Jeff Sharkey [Fri, 28 Sep 2012 02:32:54 +0000 (19:32 -0700)]
am
cc24aa2b: Merge "Follow more Secure settings to Global." into jb-mr1-dev
* commit '
cc24aa2b1f58236867a4e0c326e5ce4197df55d8':
Follow more Secure settings to Global.
Jeff Sharkey [Fri, 28 Sep 2012 02:31:09 +0000 (19:31 -0700)]
Merge "Follow more Secure settings to Global." into jb-mr1-dev
Wink Saville [Fri, 28 Sep 2012 01:16:22 +0000 (18:16 -0700)]
am
b0873900: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
* commit '
b08739003aa2cbc4dfe650f6badda8cfe2be1e76':
Fix an NPE in WifiSettings.
Wink Saville [Fri, 28 Sep 2012 01:16:04 +0000 (18:16 -0700)]
am
b0873900: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
* commit '
b08739003aa2cbc4dfe650f6badda8cfe2be1e76':
Fix an NPE in WifiSettings.
Wink Saville [Fri, 28 Sep 2012 01:14:45 +0000 (18:14 -0700)]
Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
rich cannings [Tue, 25 Sep 2012 23:20:36 +0000 (16:20 -0700)]
Developer setting to skip Package Verification
Add a developer setting to skip package verification when installing over
USB/ADB/ADT, but still perform package verification on all other installs.
This change also fixes visibility issues. Namely, now all "Verify apps"
related settings will disappear when
Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE is 0.
Bug:
7183252
Change-Id: I04cfc4f521d1ecb73df56b172cf29cbd84f53dad
Jeff Sharkey [Thu, 27 Sep 2012 05:08:16 +0000 (22:08 -0700)]
Follow more Secure settings to Global.
Bug:
7232014,
7231331,
7231198
Change-Id: Iea055cfa58edb253b55fe30bf294994ad338cfa4
Wink Saville [Thu, 27 Sep 2012 23:16:15 +0000 (16:16 -0700)]
Fix an NPE in WifiSettings.
Under stressful conditions, like the Monkey tests, getActivity() can
return null. We assume this occurs when the fragment has shut down but
asynchronous commands are returning results. This change adds appropriate
null checks but assumes during normal operation the checks are not needed.
Bug:
7152711
Change-Id: I7a3736ccead33738dab1a36e78ae1d8042db6e94
Amith Yamasani [Thu, 27 Sep 2012 23:08:54 +0000 (16:08 -0700)]
am
48af3cdb: Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
* commit '
48af3cdbd934b79ebbcd4639bb63621e93ca9ec2':
Rename "Owner info" to "User info" for secondary users
Amith Yamasani [Thu, 27 Sep 2012 23:08:39 +0000 (16:08 -0700)]
am
48af3cdb: Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
* commit '
48af3cdbd934b79ebbcd4639bb63621e93ca9ec2':
Rename "Owner info" to "User info" for secondary users
Amith Yamasani [Thu, 27 Sep 2012 23:06:48 +0000 (16:06 -0700)]
Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
Russell Brenner [Thu, 27 Sep 2012 22:17:07 +0000 (15:17 -0700)]
am
2c84b9f2: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
* commit '
2c84b9f23c1bf345478bce7a2955ac309e32fe6d':
Move super call to top of onActivityCreated
Russell Brenner [Thu, 27 Sep 2012 22:16:56 +0000 (15:16 -0700)]
am
2c84b9f2: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
* commit '
2c84b9f23c1bf345478bce7a2955ac309e32fe6d':
Move super call to top of onActivityCreated
Russell Brenner [Thu, 27 Sep 2012 22:14:26 +0000 (15:14 -0700)]
Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
Amith Yamasani [Thu, 27 Sep 2012 21:50:13 +0000 (14:50 -0700)]
Rename "Owner info" to "User info" for secondary users
Bug:
7237781
Change-Id: I40207d6aa34bf3b7403f077fc7f3a945d739269d
Adam Cohen [Thu, 27 Sep 2012 20:16:59 +0000 (13:16 -0700)]
am
f4b6a682: Merge "Addressing issue
7243210, can\'t set status widget properly" into jb-mr1-dev
* commit '
f4b6a68215a0269837b73f134ff57cf150bc1d9c':
Addressing issue
7243210, can't set status widget properly
Adam Cohen [Thu, 27 Sep 2012 20:16:36 +0000 (13:16 -0700)]
am
f4b6a682: Merge "Addressing issue
7243210, can\'t set status widget properly" into jb-mr1-dev
* commit '
f4b6a68215a0269837b73f134ff57cf150bc1d9c':
Addressing issue
7243210, can't set status widget properly
Adam Cohen [Thu, 27 Sep 2012 20:14:17 +0000 (13:14 -0700)]
Merge "Addressing issue
7243210, can't set status widget properly" into jb-mr1-dev
Robert Greenwalt [Thu, 27 Sep 2012 20:12:57 +0000 (13:12 -0700)]
am
fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev
* commit '
fffc9bef49428ac4974ed5c1ee2e4d0c0f9d4a5a':
Precreate a data structure so it's never null.
Robert Greenwalt [Thu, 27 Sep 2012 20:12:07 +0000 (13:12 -0700)]
am
fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev
* commit '
fffc9bef49428ac4974ed5c1ee2e4d0c0f9d4a5a':
Precreate a data structure so it's never null.
Robert Greenwalt [Thu, 27 Sep 2012 20:10:44 +0000 (13:10 -0700)]
Merge "Precreate a data structure so it's never null." into jb-mr1-dev
Adam Cohen [Thu, 27 Sep 2012 20:04:00 +0000 (13:04 -0700)]
Addressing issue
7243210, can't set status widget properly
Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
Robert Greenwalt [Thu, 27 Sep 2012 18:21:12 +0000 (11:21 -0700)]
Precreate a data structure so it's never null.
Fixes NPE that the fast-fingered monkey sometimes triggers.
bug:
7084178
Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
Baligh Uddin [Thu, 27 Sep 2012 17:09:06 +0000 (10:09 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 27 Sep 2012 17:06:09 +0000 (10:06 -0700)]
am
bfb5fa9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
bfb5fa9ec37d58101febd13a334707f8f7e341f5':
Import translations. DO NOT MERGE
OSDN Git Service
