OSDN Git Service

android-x86/frameworks-base.git
11 years agoam eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits...
Dirk Dougherty [Mon, 24 Jun 2013 08:39:52 +0000 (01:39 -0700)]
am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.

* commit 'eadad05c341b418cfe6249fb16d91951a3432c8a':
  Doc change: edits to education opt-in docs.

11 years agoam d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education...
Dirk Dougherty [Mon, 24 Jun 2013 08:37:52 +0000 (01:37 -0700)]
am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.

* commit 'd8dff038f9368decd5a9e1176e453a24e4309290':
  Doc change: edits to education opt-in docs.

11 years agoam 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:34:48 +0000 (01:34 -0700)]
am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.

* commit '1c77f5e2757e589bfc8c1e89e6394504f576ac52':
  Doc change: edits to education opt-in docs.

11 years agoam 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:32:54 +0000 (01:32 -0700)]
am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.

* commit '1c1113958d4e27018b02ce793809d541158440f6':
  Doc change: edits to education opt-in docs.

11 years agoam 8451fc4f: Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:30:58 +0000 (01:30 -0700)]
am 8451fc4f: Doc change: edits to education opt-in docs.

* commit '8451fc4f8660842b21e4ed3bddaedb0eb9490855':
  Doc change: edits to education opt-in docs.

11 years agoDoc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 07:30:38 +0000 (00:30 -0700)]
Doc change: edits to education opt-in docs.

Change-Id: I258a8f89c3bdbb6b5dabfe96cc7dd66dd16b8052

11 years agoam 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add...
Dirk Dougherty [Mon, 24 Jun 2013 02:45:02 +0000 (19:45 -0700)]
am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in.

* commit '6755a4d433d44506abd932b62f6552fa37bf1dd9':
  Doc change: add docs for edu opt-in.

11 years agoam 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu...
Dirk Dougherty [Mon, 24 Jun 2013 02:42:58 +0000 (19:42 -0700)]
am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in.

* commit '757b943a92d23c255dcca15944908f105265a86b':
  Doc change: add docs for edu opt-in.

11 years agoam b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:41:29 +0000 (19:41 -0700)]
am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in.

* commit 'b2e3fb4f37e6cf0e2c9e3aa00facfac9fbd4e22d':
  Doc change: add docs for edu opt-in.

11 years agoam 9db29158: am f812258e: Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:39:30 +0000 (19:39 -0700)]
am 9db29158: am f812258e: Doc change: add docs for edu opt-in.

* commit '9db291583a90babbcb6db6f2b82276f5657a3503':
  Doc change: add docs for edu opt-in.

11 years agoam f812258e: Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:37:14 +0000 (19:37 -0700)]
am f812258e: Doc change: add docs for edu opt-in.

* commit 'f812258e5ca9449402781a7330c0e3696f566e09':
  Doc change: add docs for edu opt-in.

11 years agoDoc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 00:33:15 +0000 (17:33 -0700)]
Doc change: add docs for edu opt-in.

Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4

11 years agoupdate homepage carousel for jelly bean 3.0
Scott Main [Sat, 22 Jun 2013 03:39:41 +0000 (20:39 -0700)]
update homepage carousel for jelly bean 3.0

Change-Id: Ie698493e4da0232b67630f92e80bf025be24884a

11 years agoMerge "typo" into jb-mr2-dev
Scott Main [Sat, 22 Jun 2013 03:26:26 +0000 (03:26 +0000)]
Merge "typo" into jb-mr2-dev

11 years agotypo
Scott Main [Sat, 22 Jun 2013 03:25:23 +0000 (20:25 -0700)]
typo

Change-Id: I4dcb7c67313a8e3f42ae9f56e4c0ce6e5874dfc7

11 years agoMerge "add jb-mr2 api overview" into jb-mr2-dev
Scott Main [Sat, 22 Jun 2013 03:23:50 +0000 (03:23 +0000)]
Merge "add jb-mr2 api overview" into jb-mr2-dev

11 years agoadd jb-mr2 api overview
Scott Main [Sat, 15 Jun 2013 01:01:10 +0000 (18:01 -0700)]
add jb-mr2 api overview

Change-Id: Ib46c3ad3318d19927f47f1bb0ada93adf7766147

11 years agoMerge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
kmccormick [Fri, 21 Jun 2013 23:00:18 +0000 (23:00 +0000)]
Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev

11 years agoDoc change: new Bluetooth LE doc
kmccormick [Thu, 6 Jun 2013 18:14:57 +0000 (11:14 -0700)]
Doc change: new Bluetooth LE doc

Change-Id: Ib6d67497a9b4d54d13b4da8f1f9ee991bc5ef562

11 years agoam 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from...
kmccormick [Fri, 21 Jun 2013 18:14:44 +0000 (11:14 -0700)]
am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

* commit '107e48304516e810f0ecc20a540cce1bc25f252c':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

11 years agoam c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add...
Dirk Dougherty [Fri, 21 Jun 2013 18:07:44 +0000 (11:07 -0700)]
am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.

* commit 'c496c2a8889f1b676bb48c77c81bf8d3f39ed3a1':
  Doc change: add video for edu page.

11 years agoam 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs...
kmccormick [Fri, 21 Jun 2013 18:05:26 +0000 (11:05 -0700)]
am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

* commit '3f4759a0268860511ff844c59968843e2985d3ef':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

11 years agoam 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save...
kmccormick [Fri, 21 Jun 2013 17:59:18 +0000 (10:59 -0700)]
am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

* commit '947857c11b9c50d97b9952bbbc29149680e7d4a3':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

11 years agoam cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id:...
kmccormick [Fri, 21 Jun 2013 17:57:38 +0000 (10:57 -0700)]
am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

* commit 'cce880028ee694e296d2585b8932868b14f71223':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

11 years agoam 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724...
kmccormick [Fri, 21 Jun 2013 17:56:13 +0000 (10:56 -0700)]
am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

* commit '9c309d3db95b1fc63925a18b81e6ceabcaa18407':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

11 years agoam 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to genera...
Scott Main [Fri, 21 Jun 2013 17:38:37 +0000 (10:38 -0700)]
am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev

* commit '20eac772f32e3b40959a8fb7c64565aad94b8054':
  add Arabic Google Play badges to generator bug: 7994508

11 years agoMerge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
Wink Saville [Fri, 21 Jun 2013 15:43:56 +0000 (15:43 +0000)]
Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev

11 years agoRevert "Revert "wifi: Get full scan results""
Iliyan Malchev [Fri, 21 Jun 2013 03:09:44 +0000 (03:09 +0000)]
Revert "Revert "wifi: Get full scan results""

This reverts commit c2cbd4c11bfb83344502bd80389538795bae03cb.

Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79

11 years agoThe config_show4GForLTe is dynamic use latest value.
Wink Saville [Fri, 21 Jun 2013 01:15:20 +0000 (18:15 -0700)]
The config_show4GForLTe is dynamic use latest value.

Previously this was updated only at construction time,
but the value isn't even set at that time and can change
at anytime. So instead read the current value when needed.

Bug: 9513380
Change-Id: I50c676beadf5df8190897a9f6ab94c098e8d7e71

11 years agoCherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb...
kmccormick [Tue, 11 Jun 2013 20:17:55 +0000 (13:17 -0700)]
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

Change-Id: I32fe3880852ed8bcbacec0bb5bf385b0022a791f

11 years agoam 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu...
Dirk Dougherty [Thu, 20 Jun 2013 22:35:59 +0000 (15:35 -0700)]
am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.

* commit '68630bedefb36cb6789f573b065c13e441121611':
  Doc change: add video for edu page.

11 years agoam 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:33:47 +0000 (15:33 -0700)]
am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.

* commit '8054c46e9bb87bb481195a6b823fd9d72623c80d':
  Doc change: add video for edu page.

11 years agoam e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:31:48 +0000 (15:31 -0700)]
am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.

* commit 'e4bc7d812199a8d371da264575c74874877d4824':
  Doc change: add video for edu page.

11 years agoam 6cb24e40: Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:29:27 +0000 (15:29 -0700)]
am 6cb24e40: Doc change: add video for edu page.

* commit '6cb24e40ce6218dcd56ad22e13587d7f3d6e54b9':
  Doc change: add video for edu page.

11 years agoDoc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 20:52:21 +0000 (13:52 -0700)]
Doc change: add video for edu page.

Change-Id: I81c539f0297de620ea0d0ded19d398329218f5df

11 years agoMerge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
kmccormick [Wed, 19 Jun 2013 23:38:33 +0000 (23:38 +0000)]
Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev

11 years agoDoc change: New class on avoiding save conflicts
kmccormick [Tue, 11 Jun 2013 20:17:55 +0000 (13:17 -0700)]
Doc change: New class on avoiding save conflicts

Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

11 years agoTelephonyManager.listen can have notifyNow always true.
Wink Saville [Wed, 19 Jun 2013 18:28:06 +0000 (11:28 -0700)]
TelephonyManager.listen can have notifyNow always true.

Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.

This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.

Bug: 9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a

11 years agoMerge "Change default for config_show4GForLte to true." into jb-mr2-dev
Wink Saville [Wed, 19 Jun 2013 17:09:28 +0000 (17:09 +0000)]
Merge "Change default for config_show4GForLte to true." into jb-mr2-dev

11 years agoUpdate RenderScript doxygen reference manual.
Stephen Hines [Wed, 19 Jun 2013 07:11:21 +0000 (00:11 -0700)]
Update RenderScript doxygen reference manual.

Change-Id: I0ba8f1c6c9b727b337708a3001964a7ee323483c

11 years agoMerge "Revert "wifi: Get full scan results"" into jb-mr2-dev
Iliyan Malchev [Wed, 19 Jun 2013 01:16:23 +0000 (01:16 +0000)]
Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev

11 years agoRevert "wifi: Get full scan results"
Vineeta Srivastava [Mon, 17 Jun 2013 20:24:47 +0000 (20:24 +0000)]
Revert "wifi: Get full scan results"

This reverts commit 67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.

Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713

Conflicts:
wifi/java/android/net/wifi/WifiNative.java
wifi/java/android/net/wifi/WifiStateMachine.java

11 years agoam 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug:...
Scott Main [Tue, 18 Jun 2013 22:31:37 +0000 (15:31 -0700)]
am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev

* commit '334dadec751b2e51ff8a98498f02430b765aa091':
  add Arabic Google Play badges to generator bug: 7994508

11 years agoam 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into...
Scott Main [Tue, 18 Jun 2013 22:29:41 +0000 (15:29 -0700)]
am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev

* commit '033cfd7cc8c77fbf98c69010cfd95f09b836a61b':
  add Arabic Google Play badges to generator bug: 7994508

11 years agoMerge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
Scott Main [Tue, 18 Jun 2013 22:26:45 +0000 (22:26 +0000)]
Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev

11 years agoadd Arabic Google Play badges to generator
Scott Main [Fri, 14 Jun 2013 17:58:51 +0000 (10:58 -0700)]
add Arabic Google Play badges to generator
bug: 7994508

Change-Id: Ic9fa9e69ca3c8015f717455176aa7460a5ea5f16

11 years agoChange default for config_show4GForLte to true.
Wink Saville [Tue, 18 Jun 2013 21:47:14 +0000 (14:47 -0700)]
Change default for config_show4GForLte to true.

Bug: 9265217
Change-Id: I962910de7826ce9825de2d2dfb9e50b84d0e7c75

11 years agoupdate supported media formats.
Scott Main [Tue, 18 Jun 2013 17:43:35 +0000 (10:43 -0700)]
update supported media formats.
as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c

Change-Id: If35f4bb35b8aabacb51dec79a00a0c353b8a5d3c

11 years agoMerge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
Scott Main [Tue, 18 Jun 2013 05:10:32 +0000 (05:10 +0000)]
Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev

11 years agoadd collapsed list items for 4.1 TOC
Scott Main [Tue, 18 Jun 2013 02:19:38 +0000 (19:19 -0700)]
add collapsed list items for 4.1 TOC

Change-Id: I241fb5415a3b893df7c8491c7a549f3d0d304e74

11 years agosome extra docs for TextDirectionHeuristic
Scott Main [Thu, 23 May 2013 01:17:44 +0000 (18:17 -0700)]
some extra docs for TextDirectionHeuristic

Change-Id: I8ceac72a76a29bde0e25ed418110a6e4120654e3

11 years agoadd attributes reference for splimotionevents and layoutmode
Scott Main [Mon, 10 Jun 2013 17:39:48 +0000 (10:39 -0700)]
add attributes reference for splimotionevents and layoutmode

Change-Id: Id78f2957c994fc30a0837084f22766c8cfa70fe8

11 years agoam 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \...
Scott Main [Tue, 18 Jun 2013 00:56:54 +0000 (17:56 -0700)]
am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist

* commit '23f33bdab3da7ac3eb11d483eb038024ed4e3564':
  replace 'developers strick back' with 'this week in android' playlist

11 years agoam 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in...
Scott Main [Tue, 18 Jun 2013 00:54:26 +0000 (17:54 -0700)]
am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist

* commit '6b55515ed3c1e97b0dd932a482c375d0103f84cc':
  replace 'developers strick back' with 'this week in android' playlist

11 years agoam 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
Scott Main [Tue, 18 Jun 2013 00:53:06 +0000 (17:53 -0700)]
am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist

* commit '41b08da8198e76118ef7167058a88cb920f9fb74':
  replace 'developers strick back' with 'this week in android' playlist

11 years agoreplace 'developers strick back' with 'this week in android' playlist
Scott Main [Tue, 18 Jun 2013 00:47:36 +0000 (17:47 -0700)]
replace 'developers strick back' with 'this week in android' playlist

Change-Id: I0aa94f6332da8543d7a2eba80307a36c26d7654c

11 years agoDisable a flaky test case
Xia Wang [Mon, 17 Jun 2013 23:54:40 +0000 (16:54 -0700)]
Disable a flaky test case

Change-Id: I4ef780ed0c5394b67aa002baefc00e835018c4a0

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 15 Jun 2013 02:27:44 +0000 (19:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I45fbf411dc3f8cdb9a5ebd889ccf3a2868abb5a9
Auto-generated-cl: translation import

11 years agoMerge "additional documentation for media codec info" into jb-mr2-dev
Scott Main [Sat, 15 Jun 2013 00:04:50 +0000 (00:04 +0000)]
Merge "additional documentation for media codec info" into jb-mr2-dev

11 years agoMerge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
Daniel Sandler [Fri, 14 Jun 2013 20:29:23 +0000 (20:29 +0000)]
Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev

11 years agoadditional documentation for media codec info
Scott Main [Wed, 12 Jun 2013 19:56:05 +0000 (12:56 -0700)]
additional documentation for media codec info

Change-Id: I3b4e5baccab6da2dfc8dff8d03872bb5b346a4ad

11 years agoam 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instru...
Scott Main [Fri, 14 Jun 2013 18:02:41 +0000 (11:02 -0700)]
am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions

* commit '0b3fe0785c0c6ff0ce834c06b6828f884a658730':
  fix transition from download to install instructions

11 years agoam a17201a8: am 7190a059: fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:56:28 +0000 (10:56 -0700)]
am a17201a8: am 7190a059: fix transition from download to install instructions

* commit 'a17201a81691ac337426923d1bdcf9e0a26b841e':
  fix transition from download to install instructions

11 years agoam 7190a059: fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:53:45 +0000 (10:53 -0700)]
am 7190a059: fix transition from download to install instructions

* commit '7190a05951efa4f5cf94bb22da48dce85c52bd06':
  fix transition from download to install instructions

11 years agofix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:49:55 +0000 (10:49 -0700)]
fix transition from download to install instructions

Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9

11 years agoam d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\'...
Scott Main [Fri, 14 Jun 2013 17:16:02 +0000 (10:16 -0700)]
am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins

* commit 'd2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins

11 years agoam 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal...
Scott Main [Fri, 14 Jun 2013 17:12:30 +0000 (10:12 -0700)]
am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins

* commit '6af13a74d3dcf56187edf153e0341221faf9f1ad':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins

11 years agoam ec025db4: change studio version number to use \'x\' for final decimal. also go...
Scott Main [Fri, 14 Jun 2013 17:09:12 +0000 (10:09 -0700)]
am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins

* commit 'ec025db4a74914640c42412c63413f2d5d46e45d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins

11 years agoMerge "Doc change: diffs for API 18" into jb-mr2-dev
Dirk Dougherty [Fri, 14 Jun 2013 16:23:11 +0000 (16:23 +0000)]
Merge "Doc change: diffs for API 18" into jb-mr2-dev

11 years agorevise docs for new sensor types. fix markup error causing tons of code font
Scott Main [Thu, 13 Jun 2013 23:32:50 +0000 (16:32 -0700)]
revise docs for new sensor types. fix markup error causing tons of code font

Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35

11 years agoDoc change: diffs for API 18
Dirk Dougherty [Thu, 13 Jun 2013 23:33:04 +0000 (16:33 -0700)]
Doc change: diffs for API 18

Change-Id: I92d9880959e18bb0cffa68a05a042de6d5790aa4

11 years agochange studio version number to use 'x' for final decimal.
Scott Main [Thu, 13 Jun 2013 22:00:43 +0000 (15:00 -0700)]
change studio version number to use 'x' for final decimal.
also go to install guide after download begins

Change-Id: I9ec266b20585c00cf5a643fede2df64eb2066ebc

11 years agoam cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1...
Scott Main [Thu, 13 Jun 2013 21:54:48 +0000 (14:54 -0700)]
am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev

* commit 'cb2a85058e24ecd35349b5470e402bcb52df2d6b':
  add ninepatch search tag

11 years agoam 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
Scott Main [Thu, 13 Jun 2013 21:51:47 +0000 (14:51 -0700)]
am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev

* commit '695896a46578e7ad4e540151e799a9f0b8828ad1':
  add ninepatch search tag

11 years agoam 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
Scott Main [Thu, 13 Jun 2013 21:49:20 +0000 (14:49 -0700)]
am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev

* commit '46c8931ffc78f5204b34f7ba5098defbc318b7a4':
  add ninepatch search tag

11 years agoMerge "add ninepatch search tag" into jb-mr1.1-ub-dev
Scott Main [Thu, 13 Jun 2013 21:47:27 +0000 (21:47 +0000)]
Merge "add ninepatch search tag" into jb-mr1.1-ub-dev

11 years agoMerge "Revert "Make implementation of isEmpty consistent with implementation of getCo...
Dave Burke [Thu, 13 Jun 2013 04:08:42 +0000 (04:08 +0000)]
Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev

11 years agoam e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restorin...
kmccormick [Thu, 13 Jun 2013 02:35:56 +0000 (19:35 -0700)]
am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages

* commit 'e9abc5e935deab1c63f89971380b9f9a9eed1af9':
  Doc update: restoring deprecation messages

11 years agoam b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation...
kmccormick [Thu, 13 Jun 2013 02:33:50 +0000 (19:33 -0700)]
am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages

* commit 'b89c6ac4e65c0aaadddd65d1f816860681615b1e':
  Doc update: restoring deprecation messages

11 years agoam 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:31:12 +0000 (19:31 -0700)]
am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages

* commit '9af7d4072849de24a0ac6401247c18c6ef915e2f':
  Doc update: restoring deprecation messages

11 years agoam 227615ee: am bf370185: Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:28:58 +0000 (19:28 -0700)]
am 227615ee: am bf370185: Doc update: restoring deprecation messages

* commit '227615eeb7b6008e18d2b205cadccf4943a82e94':
  Doc update: restoring deprecation messages

11 years agoam bf370185: Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:26:57 +0000 (19:26 -0700)]
am bf370185: Doc update: restoring deprecation messages

* commit 'bf3701854841f97f52cd29b601431861598f5277':
  Doc update: restoring deprecation messages

11 years agoDoc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 01:58:49 +0000 (18:58 -0700)]
Doc update: restoring deprecation messages

Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef

11 years agoam 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh...
Dirk Dougherty [Thu, 13 Jun 2013 01:41:25 +0000 (18:41 -0700)]
am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.

* commit '14ef5964255730a838301d3eb7ab38a2eb745ba6':
  Doc change: refresh gcore/gms reference from e-release.

11 years agoam 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms...
Dirk Dougherty [Thu, 13 Jun 2013 01:39:11 +0000 (18:39 -0700)]
am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.

* commit '5161fdf3039c4e31e498c259ca4bffae18d99331':
  Doc change: refresh gcore/gms reference from e-release.

11 years agoam e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from...
Dirk Dougherty [Thu, 13 Jun 2013 01:36:31 +0000 (18:36 -0700)]
am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.

* commit 'e5bde8e03574a17fea7c078ee00fb882eb3ec829':
  Doc change: refresh gcore/gms reference from e-release.

11 years agoam bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.
Dirk Dougherty [Thu, 13 Jun 2013 01:34:24 +0000 (18:34 -0700)]
am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.

* commit 'bd9e41ba72014c7412f69cafbeb775c281a36d3b':
  Doc change: refresh gcore/gms reference from e-release.

11 years agoam fe3da794: Doc change: refresh gcore/gms reference from e-release.
Dirk Dougherty [Thu, 13 Jun 2013 01:31:26 +0000 (18:31 -0700)]
am fe3da794: Doc change: refresh gcore/gms reference from e-release.

* commit 'fe3da794f7fb26325951338b1951bb6fdbbc0199':
  Doc change: refresh gcore/gms reference from e-release.

11 years agoDoc change: refresh gcore/gms reference from e-release.
Dirk Dougherty [Thu, 13 Jun 2013 01:06:08 +0000 (18:06 -0700)]
Doc change: refresh gcore/gms reference from e-release.

Change-Id: Ic9455b2ba0142cf310a2a509f706d90b5553fbf4

11 years agoam 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add...
Dirk Dougherty [Thu, 13 Jun 2013 00:43:07 +0000 (17:43 -0700)]
am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '2b336ce4d8f740715a5b2f2cc8fb07a99300ce73':
  Doc change: Add docs for GP Purchase Status API.

11 years agoam 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purch...
Dirk Dougherty [Thu, 13 Jun 2013 00:40:06 +0000 (17:40 -0700)]
am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '94e207b95799125dcc6ea65eb68697a6568579a3':
  Doc change: Add docs for GP Purchase Status API.

11 years agoRevert "Make implementation of isEmpty consistent with implementation of getCount...
Adam Powell [Thu, 13 Jun 2013 00:38:25 +0000 (17:38 -0700)]
Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"

This reverts commit ef2277ec5802143b8af1da32d7b01518401b97a9.

This caused a regression for some apps relying on the old behavior.

Bug 9372495

11 years agoam 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status...
Dirk Dougherty [Thu, 13 Jun 2013 00:37:26 +0000 (17:37 -0700)]
am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '3574bef4625402a99224a9c1051b295ed9fa0645':
  Doc change: Add docs for GP Purchase Status API.

11 years agoam 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:35:17 +0000 (17:35 -0700)]
am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '47f5c4102d096c56f9ebc71bdb351b58cfb8de42':
  Doc change: Add docs for GP Purchase Status API.

11 years agoam 57bb89f0: Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:33:37 +0000 (17:33 -0700)]
am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '57bb89f0b267140ae7f50e31ec0e3023e8836639':
  Doc change: Add docs for GP Purchase Status API.

11 years agoMerge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
Jeff Brown [Wed, 12 Jun 2013 23:59:01 +0000 (23:59 +0000)]
Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev

11 years agoMerge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
Wink Saville [Wed, 12 Jun 2013 23:13:06 +0000 (23:13 +0000)]
Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev

11 years agoDoc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Wed, 12 Jun 2013 03:10:54 +0000 (20:10 -0700)]
Doc change: Add docs for GP Purchase Status API.

Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00

11 years agoFix logspam when battery sysfs file not available.
Jeff Brown [Wed, 12 Jun 2013 22:57:38 +0000 (15:57 -0700)]
Fix logspam when battery sysfs file not available.

This was a regression caused by a recent change to use String8
instead of char*.  We missed the implicit null check here.

Bug: 9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 12 Jun 2013 20:16:34 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev