OSDN Git Service
Scott Main [Wed, 26 Sep 2012 02:05:35 +0000 (19:05 -0700)]
am
4f832bc7: am
3b1c5d55: add tip about including android:id for layout state
* commit '
4f832bc796bad90e5632c3ab69e305b3c7c008ba':
add tip about including android:id for layout state
Scott Main [Wed, 26 Sep 2012 02:03:33 +0000 (19:03 -0700)]
am
3b1c5d55: add tip about including android:id for layout state
* commit '
3b1c5d55517260516bfa5591ca08bb39d336d511':
add tip about including android:id for layout state
Scott Main [Wed, 26 Sep 2012 01:54:15 +0000 (18:54 -0700)]
add tip about including android:id for layout state
Change-Id: I9bc9157b320f8a8ac37ab30bc31fb9c457ecf4f6
Joe Fernandez [Wed, 26 Sep 2012 00:57:56 +0000 (17:57 -0700)]
am
9b516383: am
e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
* commit '
9b5163836ccf121af89040c1e465a3f96d37aa7b':
cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
Joe Fernandez [Wed, 26 Sep 2012 00:56:43 +0000 (17:56 -0700)]
am
e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
* commit '
e35d9280d6cd5bfca13f9f1c3e8e90636e00c6cf':
cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
Joe Fernandez [Fri, 24 Aug 2012 19:34:43 +0000 (12:34 -0700)]
cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7
docs: Systrace tool documentation
Change-Id: I85413fad63edd536a18123a5c09abee47051fca6
Amith Yamasani [Mon, 24 Sep 2012 15:49:47 +0000 (08:49 -0700)]
am
b079d1f2: am
5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit '
b079d1f28089ad4de05162b7df0ace90bc40a5f3':
Fixing services start order that impacts ICS - JB upgrade
Amith Yamasani [Mon, 24 Sep 2012 15:45:14 +0000 (08:45 -0700)]
am
5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit '
5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
Fixing services start order that impacts ICS - JB upgrade
The Android Open Source Project [Mon, 24 Sep 2012 14:39:06 +0000 (07:39 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ic8d0d91f79b5766b639695d8769e386958706e34
Amith Yamasani [Sun, 23 Sep 2012 23:01:52 +0000 (16:01 -0700)]
Merge "Fixing services start order that impacts ICS - JB upgrade"
John Wang [Wed, 12 Sep 2012 23:46:41 +0000 (16:46 -0700)]
Show plmn in emergency call allowed mode.
When emergency call is allowed, plmn string is used to pass up the
"Emergency calls only" string. This change set showPlmn to true
in that situation regardless the SIMRecords.SPN_RULE_SHOW_PLMN value.
bug:
7103854
Change-Id: I35ce0cc265d648191cb3b5f87261895f862143db
Victoria Lease [Thu, 20 Sep 2012 22:09:24 +0000 (15:09 -0700)]
Get your own cursor Drawables, WebViewClassic!
These are shared resources! You can't just animate *everyone's*
cursors!
Bug:
7110290
Change-Id: Icdc86af4fba427a352019cd3e2017f97a3b9fdba
Scott Main [Fri, 21 Sep 2012 23:00:51 +0000 (16:00 -0700)]
Scott Main [Fri, 21 Sep 2012 22:59:04 +0000 (15:59 -0700)]
Scott Main [Fri, 21 Sep 2012 22:55:15 +0000 (15:55 -0700)]
fix layout bug
Change-Id: Ibf3f04d6c2077c77b75076c02312d3b2dea394eb
Victoria Lease [Thu, 20 Sep 2012 23:43:25 +0000 (16:43 -0700)]
am
7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
* commit '
7c0edba0ab8803ff63ac006c8aead4fa0d1a15d8':
Get your own cursor Drawables, WebViewClassic!
Joe Fernandez [Thu, 20 Sep 2012 23:43:21 +0000 (16:43 -0700)]
am
bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev
* commit '
bbdfada0a97b779bde0c43b63979bf7edb94d94d':
docs: Systrace tool documentation
Jean-Baptiste Queru [Thu, 20 Sep 2012 23:32:57 +0000 (16:32 -0700)]
Ignore
12496bfc into jb-dev-plus-aosp
Change-Id: Ibd43b178907f547e87b4a6b0608a676b649a236a
Victoria Lease [Thu, 20 Sep 2012 22:19:05 +0000 (15:19 -0700)]
Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
Joe Fernandez [Thu, 20 Sep 2012 22:13:01 +0000 (15:13 -0700)]
Merge "docs: Systrace tool documentation" into jb-dev
Victoria Lease [Thu, 20 Sep 2012 22:09:24 +0000 (15:09 -0700)]
Get your own cursor Drawables, WebViewClassic!
These are shared resources! You can't just animate *everyone's*
cursors!
Bug:
7110290
Change-Id: Icdc86af4fba427a352019cd3e2017f97a3b9fdba
Xavier Ducrohet [Thu, 20 Sep 2012 20:56:08 +0000 (13:56 -0700)]
Merge "Add --output-text-symbols option to aapt. do not merge." into jb-dev
Joe Fernandez [Fri, 24 Aug 2012 19:34:43 +0000 (12:34 -0700)]
docs: Systrace tool documentation
Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7
Adam Powell [Wed, 19 Sep 2012 19:21:15 +0000 (12:21 -0700)]
am
56fd88d8: am
ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit '
56fd88d87ff607f65a963b5500b27ae3d4d2670e':
Implement resolving of icon attributes to resIds in AlertController
Adam Powell [Wed, 19 Sep 2012 18:56:40 +0000 (11:56 -0700)]
am
ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit '
ab12f0f72c22143523e2bce7d58d9f1021abde5c':
Implement resolving of icon attributes to resIds in AlertController
Scott Main [Wed, 19 Sep 2012 18:22:02 +0000 (11:22 -0700)]
am
19a39686: am
b79d8ecc: udpate media formats for JB
* commit '
19a39686b7bcf5c47cc0e2f99caca7beb9173212':
udpate media formats for JB
Scott Main [Wed, 19 Sep 2012 18:00:23 +0000 (11:00 -0700)]
am
b79d8ecc: udpate media formats for JB
* commit '
b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
udpate media formats for JB
Adam Powell [Wed, 19 Sep 2012 17:51:40 +0000 (10:51 -0700)]
Merge "Implement resolving of icon attributes to resIds in AlertController"
Scott Main [Tue, 18 Sep 2012 17:40:49 +0000 (10:40 -0700)]
udpate media formats for JB
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
Xavier Ducrohet [Tue, 11 Sep 2012 21:45:22 +0000 (14:45 -0700)]
Add --output-text-symbols option to aapt. do not merge.
Library projects in the SDK are built using --non-constant-id
to generate a temporary R.java class.
When the library is packaged with the application to generate an
apk, the R class is recreated with the proper IDs due to all the
resources coming from the app and all the libraries.
However for large apps with many libraries (each with their own
R class in their package), this means a lot of unnecessary IDs:
all R classes contains all the IDs including for resources from
by projects they don't have access through the dependency graph.
For really large apps (X,000 resources), with lots of libraries
(10+), this can generate tens of thousands of resources, which
can trigger dalvik's limit of 65K fields and methods per dex
files.
This changes lets aapt generate not only the R class but a simple
text file containing the list of all those IDs so that it is
easier to parse back. The SDK build system will not ask aapt
to generate the R class of the libraries (through the
--extra-packages option), instead it will then read this
file to know what IDs are needed for each library and generate
a much smaller R class for each library (using the same text
file output from compiling all the resources to get the final
integer value).
Chery-picked from
f5de650ff1e161ea135c828e43515895343d2c0f
Change-Id: I0e08ceb6e4ceb3feb169ce17df21dd35a2505e7f
Felipe Ramos [Tue, 18 Sep 2012 21:26:27 +0000 (18:26 -0300)]
Fixing services start order that impacts ICS - JB upgrade
JB has introduced LockSettingsService. When the phone is
upgrading from ICS, that used another way to store lock
settings, the LockSettingsService needs to import these
settings to store in its database. This happens when the
systemReady() method of this class is called by SystemServer.
The problem resides in the fact that the
DevicePolicyManagerService actually needs to access the
LockSettingsService during its systemReady() initialization,
causing invalid values to be read by it which propagates and
ends up causing a invalid return in the method
isActivePasswordSufficient.
If user had a Google corporate account that enforces password
related policies through Google Apps Device Policy (GADP) app
in ICS, when he upgrades to JB, the GADP will throw a
notification saying that the password doesn't meet the required
policies and needs to be changed, incorrectly, since it wasn't
touched during upgrade.
This fix initializes the LockSettingsService before the
DevicePolicyManagerService, which is the correct way since
the latter uses the first in its initialization. This prevents
this issue to happen, and probably future issues, depending
on the way that LockSettingsService evolves.
Change-Id: I3d4334a8b728f0ad9ae744cece430d15af25a0b7
Mike Lockwood [Tue, 18 Sep 2012 17:59:27 +0000 (10:59 -0700)]
am
945080b5: am
1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '
945080b5b61e28bfc05c75ba5b2030d1e43d0f19':
MtpData bmp format file can't recognize when copy bmp into DUT
Mike Lockwood [Tue, 18 Sep 2012 17:53:11 +0000 (10:53 -0700)]
am
1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '
1e86994cd0e13f9084d3f4bd0060b9e34c935490':
MtpData bmp format file can't recognize when copy bmp into DUT
Scott Main [Tue, 18 Sep 2012 17:45:23 +0000 (10:45 -0700)]
am
edf0ba6e: am
44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
* commit '
edf0ba6e1b6de8f43880267862e43ee461901c25':
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
Scott Main [Tue, 18 Sep 2012 17:45:19 +0000 (10:45 -0700)]
am
d67459ff: new Google Play badges and some updates to corresponding pages
* commit '
d67459ff191aaee34d5459960ef8e1fed82f59d5':
new Google Play badges and some updates to corresponding pages
Scott Main [Tue, 18 Sep 2012 17:45:15 +0000 (10:45 -0700)]
am
b574a264: am
b86b7f07: small update to the ADT installation steps based on new ADT UI
* commit '
b574a264e687385a236a42d3c95d00825845c820':
small update to the ADT installation steps based on new ADT UI
Katie McCormick [Tue, 18 Sep 2012 17:45:11 +0000 (10:45 -0700)]
am
ad4bbdf2: am
844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
* commit '
ad4bbdf22cc63489b541b9b8f82073e851836780':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Scott Main [Tue, 18 Sep 2012 17:45:07 +0000 (10:45 -0700)]
am
ada4f081: am
61d85c43: add link to device dock lesson
* commit '
ada4f081c641b09f7e3a3c214db868f24df957e9':
add link to device dock lesson
Dirk Dougherty [Tue, 18 Sep 2012 17:45:04 +0000 (10:45 -0700)]
am
2dec9928: am
24a024ec: Doc change: fix typo in JB highlights.
* commit '
2dec992884db8ca54ee814b4c7967c358dcd8212':
Doc change: fix typo in JB highlights.
Scott Main [Tue, 18 Sep 2012 17:45:00 +0000 (10:45 -0700)]
am
a1981bc1: am
d5abc558: docs: update for multi apk doc for ABI support
* commit '
a1981bc1ab96cd6e1c7dcb66225a5890e6a04805':
docs: update for multi apk doc for ABI support
Katie McCormick [Tue, 18 Sep 2012 17:44:57 +0000 (10:44 -0700)]
am
917d45e3: am
73ec048e: Doc update: Appwidgets JB additions.
* commit '
917d45e3d1a2d405aa0996889c40554b4a508fe1':
Doc update: Appwidgets JB additions.
Scott Main [Tue, 18 Sep 2012 17:44:53 +0000 (10:44 -0700)]
Joe Fernandez [Tue, 18 Sep 2012 17:44:50 +0000 (10:44 -0700)]
am
b9b05dfc: am
8982939d: docs: Accessibility DevGuide, Jelly Bean edition
* commit '
b9b05dfcc1deba0e5daefe13231327432cdb6cc3':
docs: Accessibility DevGuide, Jelly Bean edition
Scott Main [Tue, 18 Sep 2012 17:44:46 +0000 (10:44 -0700)]
am
0cc7398a: am
d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
* commit '
0cc7398ab9196cf3ae8075f8e7bd055a900ebb2e':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
Katie McCormick [Tue, 18 Sep 2012 17:44:42 +0000 (10:44 -0700)]
am
2141c068: am
243170f7: Doc update: Fix typo.
* commit '
2141c06849cb5b2f5bea06a79de66b7de4112ac9':
Doc update: Fix typo.
Scott Main [Tue, 18 Sep 2012 17:44:32 +0000 (10:44 -0700)]
am
9ae01846: fix broken link for action bar pack
* commit '
9ae018462a5fa44e3e1d4837942b5fd880531124':
fix broken link for action bar pack
Mike Lockwood [Tue, 18 Sep 2012 17:25:41 +0000 (10:25 -0700)]
Merge "MtpData bmp format file can't recognize when copy bmp into DUT"
Jean-Baptiste Queru [Tue, 18 Sep 2012 15:01:04 +0000 (08:01 -0700)]
Skip
f5cbd762 - it's in frameworks/opt/telephony
Change-Id: Ifeeeab4e2672c9c71b9a1298e13e12005b53f801
Scott Main [Tue, 18 Sep 2012 04:30:16 +0000 (21:30 -0700)]
am
44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
* commit '
442040208cba3be464d7a180283d72d9ec074def':
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
Scott Main [Thu, 13 Sep 2012 21:52:03 +0000 (14:52 -0700)]
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468
new Google Play badges and some updates to corresponding pages
Change-Id: I8502a47b9d79d9a03a51c7baaacaa454fd63e5a5
Scott Main [Thu, 13 Sep 2012 21:52:03 +0000 (14:52 -0700)]
new Google Play badges and some updates to corresponding pages
Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468
Xavier Ducrohet [Mon, 17 Sep 2012 19:05:36 +0000 (12:05 -0700)]
am
5de96035: am
31820a35: Merge "Add --output-text-symbols option to aapt."
* commit '
5de9603529ee01a416b5fa31074197565fde4482':
Add --output-text-symbols option to aapt.
Xavier Ducrohet [Mon, 17 Sep 2012 19:05:30 +0000 (12:05 -0700)]
am
cc9747ed: am
d7252571: Merge "Add --error-on-failed-insert option to aapt."
* commit '
cc9747ed45302956a3ec9dd21f7b950b837dbfdd':
Add --error-on-failed-insert option to aapt.
Xavier Ducrohet [Mon, 17 Sep 2012 19:03:19 +0000 (12:03 -0700)]
am
31820a35: Merge "Add --output-text-symbols option to aapt."
* commit '
31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
Add --output-text-symbols option to aapt.
Xavier Ducrohet [Mon, 17 Sep 2012 19:03:12 +0000 (12:03 -0700)]
am
d7252571: Merge "Add --error-on-failed-insert option to aapt."
* commit '
d72525718ea7ef3e1f97cf557365b143c8919a5b':
Add --error-on-failed-insert option to aapt.
Scott Main [Mon, 17 Sep 2012 18:23:20 +0000 (11:23 -0700)]
am
b86b7f07: small update to the ADT installation steps based on new ADT UI
* commit '
b86b7f07d79cae32cda710aa9cc328e7af2c8ccc':
small update to the ADT installation steps based on new ADT UI
Katie McCormick [Mon, 17 Sep 2012 18:21:51 +0000 (11:21 -0700)]
am
844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
* commit '
844d2a942ebde7eb1d5abd68505c7a2eb7e2db0a':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Scott Main [Mon, 17 Sep 2012 18:21:48 +0000 (11:21 -0700)]
am
61d85c43: add link to device dock lesson
* commit '
61d85c43474da17296b90b3d7fd0f4bd34cdebe8':
add link to device dock lesson
Dirk Dougherty [Mon, 17 Sep 2012 18:20:19 +0000 (11:20 -0700)]
am
24a024ec: Doc change: fix typo in JB highlights.
* commit '
24a024ecaf949601b998a4b0ed3b4d7af6bcd8ba':
Doc change: fix typo in JB highlights.
Scott Main [Mon, 17 Sep 2012 18:20:16 +0000 (11:20 -0700)]
am
d5abc558: docs: update for multi apk doc for ABI support
* commit '
d5abc5586e08bedf06f337aefa5a59c014fb7a2e':
docs: update for multi apk doc for ABI support
Katie McCormick [Mon, 17 Sep 2012 18:20:12 +0000 (11:20 -0700)]
am
73ec048e: Doc update: Appwidgets JB additions.
* commit '
73ec048e4de50419d2d49907be0acae0893f92ca':
Doc update: Appwidgets JB additions.
Scott Main [Mon, 17 Sep 2012 18:20:09 +0000 (11:20 -0700)]
am
54efa69f: older not lower
* commit '
54efa69f5074568f23eb5ff7f15022eece11918c':
older not lower
Joe Fernandez [Mon, 17 Sep 2012 18:20:06 +0000 (11:20 -0700)]
am
8982939d: docs: Accessibility DevGuide, Jelly Bean edition
* commit '
8982939d17881c7dcd20459955f3bfcec6e05905':
docs: Accessibility DevGuide, Jelly Bean edition
Scott Main [Mon, 17 Sep 2012 18:20:05 +0000 (11:20 -0700)]
am
d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
* commit '
d46023d2081c995b2ec61b48b79f2077dfdb36a2':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
Katie McCormick [Mon, 17 Sep 2012 18:09:16 +0000 (11:09 -0700)]
am
243170f7: Doc update: Fix typo.
* commit '
243170f759252c99052a903bd0cb33e4d8227aa0':
Doc update: Fix typo.
Xavier Ducrohet [Mon, 17 Sep 2012 17:59:22 +0000 (10:59 -0700)]
Merge "Add --output-text-symbols option to aapt."
Scott Main [Tue, 11 Sep 2012 22:20:53 +0000 (15:20 -0700)]
small update to the ADT installation steps based on new ADT UI
Xavier Ducrohet [Mon, 17 Sep 2012 17:57:58 +0000 (10:57 -0700)]
Merge "Add --error-on-failed-insert option to aapt."
Katie McCormick [Mon, 10 Sep 2012 22:32:46 +0000 (15:32 -0700)]
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Scott Main [Mon, 10 Sep 2012 23:20:08 +0000 (16:20 -0700)]
add link to device dock lesson
Dirk Dougherty [Fri, 7 Sep 2012 17:29:30 +0000 (10:29 -0700)]
Doc change: fix typo in JB highlights.
Scott Main [Wed, 5 Sep 2012 18:52:01 +0000 (11:52 -0700)]
docs: update for multi apk doc for ABI support
Katie McCormick [Mon, 27 Aug 2012 22:43:21 +0000 (15:43 -0700)]
Doc update: Appwidgets JB additions.
Scott Main [Wed, 5 Sep 2012 18:54:05 +0000 (11:54 -0700)]
older not lower
Joe Fernandez [Wed, 1 Aug 2012 23:21:17 +0000 (16:21 -0700)]
docs: Accessibility DevGuide, Jelly Bean edition
Scott Main [Wed, 5 Sep 2012 03:55:57 +0000 (20:55 -0700)]
dashboard update for 9/4
switch to simplified pie charts: codenames for platforms and separate size and density charts
Katie McCormick [Wed, 29 Aug 2012 20:37:01 +0000 (13:37 -0700)]
Doc update: Fix typo.
Elliott Hughes [Fri, 14 Sep 2012 23:36:33 +0000 (16:36 -0700)]
am
f5437ee8: am
297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit '
f5437ee86a34751fa6d441b95282feb315e19eb6':
Deprecate those parts of DateUtils the documentation says not to use.
Elliott Hughes [Fri, 14 Sep 2012 23:34:41 +0000 (16:34 -0700)]
am
297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit '
297ad257464d2ea65cabd45ddb19f6da34b39157':
Deprecate those parts of DateUtils the documentation says not to use.
Elliott Hughes [Fri, 14 Sep 2012 23:12:36 +0000 (16:12 -0700)]
Merge "Deprecate those parts of DateUtils the documentation says not to use."
Elliott Hughes [Wed, 29 Aug 2012 01:57:13 +0000 (18:57 -0700)]
Deprecate those parts of DateUtils the documentation says not to use.
Applications using these fields and methods are just asking for i18n bugs.
Also @deprecate two int[]s that were never meant to be public.
Change-Id: I29b3a1c0c663fe344d2567df6ed3bb537270b3b7
Scott Main [Fri, 14 Sep 2012 22:21:06 +0000 (15:21 -0700)]
fix broken link for action bar pack
Change-Id: I58e774ef2b96bacd3678bd2354a584d58dd018ee
Raph Levien [Fri, 14 Sep 2012 19:16:32 +0000 (12:16 -0700)]
am
eceb3171: am
f4afc401: Merge "framework: fix bug for uninitialized variable"
* commit '
eceb317116d87dada85d06df8fe0e07dd4aec49d':
framework: fix bug for uninitialized variable
Raph Levien [Fri, 14 Sep 2012 19:15:03 +0000 (12:15 -0700)]
am
f4afc401: Merge "framework: fix bug for uninitialized variable"
* commit '
f4afc40101c00800c4dc53f165b93f741327416d':
framework: fix bug for uninitialized variable
Raph Levien [Fri, 14 Sep 2012 18:52:11 +0000 (11:52 -0700)]
Merge "framework: fix bug for uninitialized variable"
Katie McCormick [Thu, 13 Sep 2012 16:39:50 +0000 (09:39 -0700)]
am
2f140f96: Merge "Doc change: GCM changes" into jb-dev
* commit '
2f140f9692c3f8e8ae278839637ff5f72d145c60':
Doc change: GCM changes
John Wang [Thu, 13 Sep 2012 16:36:47 +0000 (09:36 -0700)]
Merge "Show plmn in emergency call allowed mode." into jb-dev
Katie McCormick [Wed, 12 Sep 2012 23:58:31 +0000 (16:58 -0700)]
Merge "Doc change: GCM changes" into jb-dev
John Wang [Wed, 12 Sep 2012 23:46:41 +0000 (16:46 -0700)]
Show plmn in emergency call allowed mode.
When emergency call is allowed, plmn string is used to pass up the
"Emergency calls only" string. This change set showPlmn to true
in that situation regardless the SIMRecords.SPN_RULE_SHOW_PLMN value.
bug:
7103854
Change-Id: I35ce0cc265d648191cb3b5f87261895f862143db
Katie McCormick [Wed, 29 Aug 2012 22:10:00 +0000 (15:10 -0700)]
Doc change: GCM changes
Bug:
7072792
Change-Id: I718e407647571d093996139b857f703c104d4e4d
Elliott Hughes [Wed, 12 Sep 2012 18:06:56 +0000 (11:06 -0700)]
am
4c686dad: am
cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit '
4c686dad83b6712e0e1abab6aba9c7bb683000b2':
Include <sys/socket.h> instead of <linux/socket.h>.
Elliott Hughes [Wed, 12 Sep 2012 18:04:45 +0000 (11:04 -0700)]
am
cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit '
cceed1dfe13e99c4ffdc2586bff22d325a57c599':
Include <sys/socket.h> instead of <linux/socket.h>.
Scott Main [Wed, 12 Sep 2012 17:43:57 +0000 (10:43 -0700)]
am
8dc0ff07: Merge "fix another link in the style doc" into jb-dev
* commit '
8dc0ff07c9713945b0075dd1010057a47cb8c40b':
fix another link in the style doc
Scott Main [Wed, 12 Sep 2012 17:41:20 +0000 (10:41 -0700)]
Merge "fix another link in the style doc" into jb-dev
Scott Main [Wed, 12 Sep 2012 17:40:29 +0000 (10:40 -0700)]
fix another link in the style doc
Change-Id: Icd40456ab32232eacc6fa3acdd86ff78aa03e3aa
Elliott Hughes [Wed, 12 Sep 2012 17:13:27 +0000 (10:13 -0700)]
Merge "Include <sys/socket.h> instead of <linux/socket.h>."
Scott Main [Wed, 12 Sep 2012 17:11:00 +0000 (10:11 -0700)]
am
94b2b5ef: Merge "fix links to style and themes source files" into jb-dev
* commit '
94b2b5efa017138663e00e23e138333149641023':
fix links to style and themes source files
Scott Main [Wed, 12 Sep 2012 17:08:35 +0000 (10:08 -0700)]
Merge "fix links to style and themes source files" into jb-dev
Scott Main [Wed, 12 Sep 2012 17:05:38 +0000 (10:05 -0700)]
fix links to style and themes source files
Change-Id: I49759c689c3d345be014c7a252e266d7529af230
The Android Open Source Project [Wed, 12 Sep 2012 14:49:49 +0000 (07:49 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I41a4b710eb0846eaf276f21b75c8d9bb2f76c977
OSDN Git Service
