OSDN Git Service
Fabrice Di Meglio [Sat, 17 Nov 2012 00:35:59 +0000 (16:35 -0800)]
Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev
Michael Jurka [Fri, 16 Nov 2012 23:29:16 +0000 (15:29 -0800)]
Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
Michael Jurka [Fri, 16 Nov 2012 02:22:47 +0000 (18:22 -0800)]
Delete appWidgetId when removing lockscreen widgets
Bug:
7550012
Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
Jim Miller [Thu, 15 Nov 2012 02:35:02 +0000 (18:35 -0800)]
Fix keyguard pin/simpin/simpuk RTL-ization
This fixes the PIN, SIM PIN, and SIM PUK keyboards to keep the keys in the same
position for all languages.
Fixes bug
7538528
Change-Id: Ib07e89e9496e6c5b91c1bbda7781eddeddea0554
Guang Zhu [Fri, 16 Nov 2012 22:06:00 +0000 (14:06 -0800)]
Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev
Amith Yamasani [Fri, 16 Nov 2012 18:43:47 +0000 (10:43 -0800)]
Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev
Scott Main [Fri, 16 Nov 2012 17:52:27 +0000 (09:52 -0800)]
am
33e499ea: docs: move articles into group directory
* commit '
33e499ea364e4e061964bc8fe16365fd632eb39d':
docs: move articles into group directory
Scott Main [Fri, 16 Nov 2012 16:54:27 +0000 (08:54 -0800)]
docs: move articles into group directory
Change-Id: If90f5ac284d8df16b830d5744fbd684e5b1b34e3
Guang Zhu [Fri, 16 Nov 2012 03:49:42 +0000 (19:49 -0800)]
grant shell user EXPAND_STATUS_BAR permission
Bug:
7555251
Change-Id: I68cebb26bcee060c56e124941f3ea9289ab2b3bf
Scott Main [Fri, 16 Nov 2012 02:33:30 +0000 (18:33 -0800)]
am
fa1320e6: docs: revise getting started intro
* commit '
fa1320e6148285b2125369fcd5799331132b0eba':
docs: revise getting started intro
Scott Main [Fri, 16 Nov 2012 02:27:32 +0000 (18:27 -0800)]
docs: revise getting started intro
Change-Id: I7561da6ae2f21e31370f5dbbd121f2c6084523c1
Scott Main [Fri, 16 Nov 2012 01:11:44 +0000 (17:11 -0800)]
am
4e2e9bae: docs: update checksums/sizes for new adt bundles
* commit '
4e2e9bae4082dffa8c59ee10204fd265dfb896bc':
docs: update checksums/sizes for new adt bundles
Scott Main [Fri, 16 Nov 2012 01:09:19 +0000 (17:09 -0800)]
docs: update checksums/sizes for new adt bundles
Change-Id: Id1245a9f1ce7cf4854e8f39a9938b00aa18e4cca
Scott Main [Thu, 15 Nov 2012 23:22:31 +0000 (15:22 -0800)]
am
d4ff8249: Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev
* commit '
d4ff824915e1c9ea1c3122b5745973f681915279':
docs: update sdk install to handle both 32 and 64-bit bundles
Scott Main [Thu, 15 Nov 2012 23:19:11 +0000 (15:19 -0800)]
Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev
Scott Main [Thu, 15 Nov 2012 22:56:52 +0000 (14:56 -0800)]
docs: update sdk install to handle both 32 and 64-bit bundles
Change-Id: I171f28a332c4d31600865f6ad8f6a95fb4f0c3aa
Adam Cohen [Thu, 15 Nov 2012 22:56:19 +0000 (14:56 -0800)]
Merge "Making sure launcher doesn't show keyguard-only widgets (issue
7550090)" into jb-mr1.1-dev
Adam Cohen [Thu, 15 Nov 2012 22:10:07 +0000 (14:10 -0800)]
Making sure launcher doesn't show keyguard-only widgets (issue
7550090)
Change-Id: I5d0675f0c03677e06371a6730209c3466c6b0f15
Amith Yamasani [Thu, 15 Nov 2012 22:39:18 +0000 (14:39 -0800)]
Make sure that the owner user is marked initialized.
This is required for upgrades from previous versions of JB.
Bug:
7547639
Change-Id: I21de14a70d6ba2ab21437b5f0721321df45226d2
Adam Cohen [Thu, 15 Nov 2012 21:53:52 +0000 (13:53 -0800)]
Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev
Adam Cohen [Thu, 1 Nov 2012 21:06:16 +0000 (14:06 -0700)]
Pushing state persistence to a background thread
Change-Id: If776bc22c48525ba91dc7e4dd0e27de92612f2f5
Fabrice Di Meglio [Thu, 15 Nov 2012 20:21:00 +0000 (12:21 -0800)]
Merge "Fix bug #
6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 19:48:20 +0000 (11:48 -0800)]
Merge "Useful annotations for code documentation." into jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 19:47:07 +0000 (11:47 -0800)]
Merge "Utility to format human-friendly durations." into jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 19:45:49 +0000 (11:45 -0800)]
Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 19:44:50 +0000 (11:44 -0800)]
Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 19:44:12 +0000 (11:44 -0800)]
Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev
Scott Main [Thu, 15 Nov 2012 19:08:28 +0000 (11:08 -0800)]
am
7425bf86: Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
* commit '
7425bf864e0dcefe238daa4c4bf7745095f262d2':
docs: fix ndk tos layout for small screens
Scott Main [Thu, 15 Nov 2012 19:04:38 +0000 (11:04 -0800)]
Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
Scott Main [Thu, 15 Nov 2012 19:03:46 +0000 (11:03 -0800)]
docs: fix ndk tos layout for small screens
Change-Id: I95e11481cdfe759416b4a661580ee9e6b0dd24d2
Scott Main [Thu, 15 Nov 2012 18:32:39 +0000 (10:32 -0800)]
am
bce26803: docs: fix broken youtube playlists
* commit '
bce268034e4e881704c4263822315bc9a4f9aa43':
docs: fix broken youtube playlists
Scott Main [Thu, 15 Nov 2012 18:26:40 +0000 (10:26 -0800)]
docs: fix broken youtube playlists
Change-Id: I07a1e9af2c8104a56c9a5e6d1060de7578cbd1ae
kmccormick@google.com [Thu, 15 Nov 2012 17:54:41 +0000 (09:54 -0800)]
am
480ac7fc: am
596d0e38: am
f53c5f36: am
d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '
480ac7fca61a29a7a1ca150ea0a583901971f137':
Doc Update: Fixing images
kmccormick@google.com [Thu, 15 Nov 2012 17:51:56 +0000 (09:51 -0800)]
am
596d0e38: am
f53c5f36: am
d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '
596d0e3881782096f7a6ea9959e8dc5f07004623':
Doc Update: Fixing images
kmccormick@google.com [Thu, 15 Nov 2012 17:49:21 +0000 (09:49 -0800)]
am
f53c5f36: am
d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '
f53c5f3683b71d232a78e04ea06649dd5e4bfee1':
Doc Update: Fixing images
kmccormick@google.com [Thu, 15 Nov 2012 17:45:46 +0000 (09:45 -0800)]
am
d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '
d1ae2721fa7b350b979e75319812636ea31bb56b':
Doc Update: Fixing images
&& repo sync -j8 [Thu, 15 Nov 2012 17:43:17 +0000 (09:43 -0800)]
Merge "Doc Update: Fixing images" into jb-dev-docs
Baligh Uddin [Thu, 15 Nov 2012 16:15:51 +0000 (08:15 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Thu, 15 Nov 2012 16:16:31 +0000 (08:16 -0800)]
am
c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c3b6ee6068f7970c2a7f9da6f784adc2e6b2bceb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 Nov 2012 16:13:48 +0000 (08:13 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 15 Nov 2012 16:06:37 +0000 (08:06 -0800)]
am
36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
36c7d313af815c8842d7ca9002ff36bfe347716b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 Nov 2012 16:03:07 +0000 (08:03 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Thu, 15 Nov 2012 16:02:07 +0000 (08:02 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Daniel Sandler [Thu, 15 Nov 2012 13:03:43 +0000 (05:03 -0800)]
Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev
Daniel Sandler [Thu, 15 Nov 2012 13:03:10 +0000 (05:03 -0800)]
Merge "Notification vibration improvements:" into jb-mr1.1-dev
Fabrice Di Meglio [Thu, 15 Nov 2012 03:57:11 +0000 (19:57 -0800)]
Fix bug #
6638582 Password fields appears RTL in Arabic locale , it should be LTR
- change heuristic to LTR.
Change-Id: I3c5f413e48ceddbd931d713eb8c168431fcd09a2
Scott Main [Thu, 15 Nov 2012 03:13:05 +0000 (19:13 -0800)]
am
0034beab: resolved conflicts for merge of
783e115b to jb-mr1-dev
* commit '
0034beab72d6574de5009e5947729a2bfd17d66e':
implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
Scott Main [Thu, 15 Nov 2012 03:10:18 +0000 (19:10 -0800)]
resolved conflicts for merge of
783e115b to jb-mr1-dev
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07
Scott Main [Thu, 15 Nov 2012 03:04:05 +0000 (19:04 -0800)]
resolved conflicts for merge of
e907a390 to jb-dev-plus-aosp
Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef
&& repo sync -j8 [Thu, 15 Nov 2012 02:26:07 +0000 (18:26 -0800)]
Doc Update: Fixing images
Bug:
7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
Scott Main [Thu, 15 Nov 2012 01:38:15 +0000 (17:38 -0800)]
am
22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis
* commit '
22cc2764cc74e52888b043e0c6371594305bb5e9':
implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
Scott Main [Thu, 8 Nov 2012 00:35:16 +0000 (16:35 -0800)]
implement new organization for Training classes
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.
Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
Joe Fernandez [Thu, 15 Nov 2012 01:00:55 +0000 (17:00 -0800)]
am
e3be79be: Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev
* commit '
e3be79be3f81f1af67f4f6704ae452512065bce6':
docs: Added note on MIPS system image additions
Joe Fernandez [Thu, 15 Nov 2012 00:57:30 +0000 (16:57 -0800)]
Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev
Scott Main [Wed, 14 Nov 2012 23:13:28 +0000 (15:13 -0800)]
am
8680f8ff: Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev
* commit '
8680f8ff6d623dfee833e378ec5900769cd5c8c2':
docs: add warning for adt bundle on 32-bit os
Scott Main [Wed, 14 Nov 2012 23:10:18 +0000 (15:10 -0800)]
Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev
Scott Main [Wed, 14 Nov 2012 22:13:21 +0000 (14:13 -0800)]
docs: add warning for adt bundle on 32-bit os
Change-Id: I0a2a62f66e64290006d67b9509b4223588d654b7
Jeff Sharkey [Wed, 14 Nov 2012 22:39:19 +0000 (14:39 -0800)]
Avoid runtime restart after vold reconnects.
Rely on behavior of already-released CountDownLatch instead of
clearing the reference.
Bug:
7290521
Change-Id: I787e673b97d18be412d5b37e279fbf1275b49151
Daniel Sandler [Wed, 14 Nov 2012 19:25:46 +0000 (11:25 -0800)]
Do not vibe when the default notification sound is Silent.
(This relates to the new vibration fallback behavior, where
notifications that expect to make a sound should always
vibrate in vibrate mode. We should not vibrate if the
notification's sound is silent, but we should also not
vibrate if the notification uses the default sound and the
default is silent.)
Bug:
7537077
Change-Id: I08e149c8c00ef2d2f61e418d88a086cb5e9cf241
Victoria Lease [Wed, 14 Nov 2012 21:18:57 +0000 (13:18 -0800)]
Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev
Quddus Chong [Wed, 14 Nov 2012 21:10:15 +0000 (13:10 -0800)]
am
73b1f68e: Merge "docs: Updated uiautomator API docs to reflect correct API level. bug:
7538348" into jb-mr1-dev
* commit '
73b1f68e3ca6eb5361f83565c8f37d45393a7e80':
docs: Updated uiautomator API docs to reflect correct API level. bug:
7538348
Quddus Chong [Wed, 14 Nov 2012 21:08:20 +0000 (13:08 -0800)]
Merge "docs: Updated uiautomator API docs to reflect correct API level. bug:
7538348" into jb-mr1-dev
Quddus Chong [Wed, 14 Nov 2012 19:24:10 +0000 (11:24 -0800)]
docs: Updated uiautomator API docs to reflect correct API level.
bug:
7538348
Change-Id: I03cdc53096a87e79ed8d4584dd0f726e8337c2a2
Daniel Sandler [Wed, 14 Nov 2012 04:49:47 +0000 (20:49 -0800)]
Notification vibration improvements:
- When notifications vibrate as a fallback (that is,
because they want to play a sound but the device is in
vibrate mode), this no longer requires the VIBRATE
permission.
- As a bonus, if your notifications use DEFAULT_VIBRATE,
you don't need the VIBRATE permission either.
- If you specify a custom vibration pattern, you'll still
need the VIBRATE permission for that.
- Notifications vibrating in fallback mode use a different
vibration pattern.
- The DEFAULT_VIBRATE and fallback vibrate patterns are now
specified in config.xml.
Bug:
7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
Joe Fernandez [Wed, 14 Nov 2012 18:37:46 +0000 (10:37 -0800)]
docs: Added note on MIPS system image additions
Change-Id: I21e79563ea92358f274c90d3495439182aa4450e
Roman Nurik [Wed, 14 Nov 2012 19:36:11 +0000 (11:36 -0800)]
am
6ed48015: Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev
* commit '
6ed48015190d67d4a5f916d6c7f5365e3c10d0bf':
docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
Roman Nurik [Wed, 14 Nov 2012 19:34:02 +0000 (11:34 -0800)]
Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev
Roman Nurik [Wed, 14 Nov 2012 18:49:08 +0000 (10:49 -0800)]
docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
Change-Id: Id0a17f187c4ca3c24295257b0c5ca653d1c8cd4d
Baligh Uddin [Wed, 14 Nov 2012 18:40:07 +0000 (10:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I940584ca0ba981c5af42430d3166798595ff656b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Nov 2012 18:39:26 +0000 (10:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I28291cc43ab74267b771dacf7dc570447a4a3dcf
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Nov 2012 18:13:51 +0000 (10:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I13afa2f030ae612ee052a52180bfd00d2f49b1e7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Nov 2012 18:11:28 +0000 (10:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I44ee12f2a6399347b884f91259117be4774b964b
Auto-generated-cl: translation import
Andreas Huber [Wed, 14 Nov 2012 17:16:59 +0000 (09:16 -0800)]
Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
and cannot be used to configure the _encoder_ to emit ADTS content.
Change-Id: I47177099b204027b726b2c7ec9b93be6835d88f6
related-to-bug:
7542186
Jeff Sharkey [Wed, 14 Nov 2012 00:23:59 +0000 (16:23 -0800)]
Utility to format human-friendly durations.
Bug:
6777872
Change-Id: Ie7ebcb456306f4f88b4707030dd7beda3fc90368
Victoria Lease [Tue, 13 Nov 2012 23:12:51 +0000 (15:12 -0800)]
Resolve LocationManager + ActivityManager conflict
LocationManagerService was serially stuffing the same Location into
multiple Intents, which it would immediately hand off to
ActivityManagerService, running as a different thread in the same
process. LocationManager would continue to work with that Location
while ActivityManagerService worked with a Parceled version of it.
However, Location.mExtras is also a Bundle, and both
ActivityManagerService and LocationManagerService ended up working
with references to the same Bundle. ActivityManagerService needs
it in Parceled form (ie mParceledData != null), but
LocationManagerService was triggering Bundle.unparcel() when
referencing the data contained within.
As a result, LocationManagerService was able to trigger NPE (or
worse) in ActivityManagerService by manipulating the mExtras
member of a Location that was in the process of being reported to
listeners.
To resolve this issue, I copy-construct a new Location to report to
each listener. This should prevent ActivityManagerService and
LocationManagerService from referencing the same Bundle data, as
Location's copy constructor also copyconstructs the mExtras member,
rather than simply share references.
Bug:
7518371
Change-Id: I1a92615cba361831494447d5de085a8d910b6b2c
Joe Malin [Tue, 13 Nov 2012 22:26:44 +0000 (14:26 -0800)]
am
4422596d: am
ce37f1da: am
4979a0b5: am
5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '
4422596ddb295f812bb0970ec7f75d3c45d05020':
Notification.java javadoc: addAction
Joe Malin [Tue, 13 Nov 2012 22:25:09 +0000 (14:25 -0800)]
am
ce37f1da: am
4979a0b5: am
5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '
ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
Notification.java javadoc: addAction
Joe Malin [Tue, 13 Nov 2012 22:22:58 +0000 (14:22 -0800)]
am
4979a0b5: am
5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '
4979a0b59486d737a4d9267af9b38f237705e26f':
Notification.java javadoc: addAction
Joe Malin [Tue, 13 Nov 2012 22:20:54 +0000 (14:20 -0800)]
am
5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '
5f32d3375b13e581d3101ed8e928fd6a463f3809':
Notification.java javadoc: addAction
Joe Malin [Tue, 13 Nov 2012 22:14:23 +0000 (14:14 -0800)]
Merge "Notification.java javadoc: addAction" into jb-dev-docs
Joe Fernandez [Tue, 13 Nov 2012 21:38:25 +0000 (13:38 -0800)]
am
9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev
* commit '
9b703463ebf67182e78dd2b05183636fbb37f3c9':
docs: Update platform version page with 4.2 release
Joe Fernandez [Tue, 13 Nov 2012 21:36:01 +0000 (13:36 -0800)]
Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev
Joe Fernandez [Tue, 13 Nov 2012 20:31:57 +0000 (12:31 -0800)]
docs: Update platform version page with 4.2 release
Change-Id: I98f8090a8cf8100584a428c407374d7188d1f42b
Scott Main [Tue, 13 Nov 2012 19:42:53 +0000 (11:42 -0800)]
am
f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev
* commit '
f20b146fffdb672fb5b541d150240f8ef21a8710':
docs: add ndk tos wall
Scott Main [Tue, 13 Nov 2012 19:41:14 +0000 (11:41 -0800)]
Merge "docs: add ndk tos wall" into jb-mr1-dev
Scott Main [Tue, 13 Nov 2012 19:24:35 +0000 (11:24 -0800)]
docs: add ndk tos wall
Change-Id: Ic7338d7d3606a017c84ce9895dfe68f2b931d182
Fabrice Di Meglio [Tue, 13 Nov 2012 19:03:19 +0000 (11:03 -0800)]
Merge "Fix bug #
7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev
Michael Jurka [Tue, 13 Nov 2012 18:36:25 +0000 (10:36 -0800)]
Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev
Craig Mautner [Tue, 13 Nov 2012 18:00:03 +0000 (10:00 -0800)]
Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
Dirk Dougherty [Tue, 13 Nov 2012 17:25:46 +0000 (09:25 -0800)]
am
c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev
* commit '
c178ebe719b80418cb193865ef68bb21cd5b7a1b':
Doc change: update image for landing page.
Dirk Dougherty [Tue, 13 Nov 2012 17:23:49 +0000 (09:23 -0800)]
Merge "Doc change: update image for landing page." into jb-mr1-dev
Dirk Dougherty [Tue, 13 Nov 2012 17:05:22 +0000 (09:05 -0800)]
Doc change: update image for landing page.
Change-Id: I8e88b3972c5597e0510b94938572b7219eecba46
Scott Main [Tue, 13 Nov 2012 17:13:41 +0000 (09:13 -0800)]
am
bd2b5313: Merge "docs: edits" into jb-mr1-dev
* commit '
bd2b531359d7402b742c4a126ff1c0782107ab79':
docs: edits
Scott Main [Tue, 13 Nov 2012 17:10:20 +0000 (09:10 -0800)]
Merge "docs: edits" into jb-mr1-dev
Scott Main [Tue, 13 Nov 2012 17:08:42 +0000 (09:08 -0800)]
docs: edits
Change-Id: I6a9f22100a138c594993cd9e0c1edfe0bb33affa
Baligh Uddin [Tue, 13 Nov 2012 16:53:29 +0000 (08:53 -0800)]
am
9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
9508e31dcd41bbdbff255913b72489af95e9bd0c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Nov 2012 16:50:50 +0000 (08:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Craig Mautner [Tue, 13 Nov 2012 16:27:22 +0000 (08:27 -0800)]
Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev
Scott Main [Tue, 13 Nov 2012 15:46:50 +0000 (07:46 -0800)]
am
574c2cbf: Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev
* commit '
574c2cbfb628e58c8b9ab28a4d7483c4024cef56':
docs: add templated tabs for jb highlights
Scott Main [Tue, 13 Nov 2012 15:42:57 +0000 (07:42 -0800)]
Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev