OSDN Git Service
Selim Gurun [Sun, 21 Apr 2013 04:34:55 +0000 (21:34 -0700)]
am
940718d8: am
a6854579: am
fa1f7d21: am
07c9c291: am
a2b0b35e: am
5fba3404: am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
940718d8598e4b8da3009b46e8edba9d1dc6ed40':
Revert "Add a delimiter between scheme and host"
Geremy Condra [Sun, 21 Apr 2013 04:34:54 +0000 (21:34 -0700)]
am
5f49fd86: am
464be797: (-s ours) am
30504327: am
62588d79: am
8f87c5d8: am
ed1e5a87: am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
5f49fd866105cd8d5e7355d40d1268f4cc121ef7':
Add a delimiter between scheme and host
Stephen Hines [Sun, 21 Apr 2013 04:34:54 +0000 (21:34 -0700)]
am
b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev
* commit '
b322f99476574546cad638ed8e2866ec106d51fc':
Add new error code for Debug Context work.
Jeff Brown [Sun, 21 Apr 2013 04:34:53 +0000 (21:34 -0700)]
am
a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev
* commit '
a937b8cb333d53cbbe8c0de7fb58854b77dcb3db':
Revert all recent GLSurfaceView changes.
Fabrice Di Meglio [Sun, 21 Apr 2013 04:34:53 +0000 (21:34 -0700)]
am
c3d0a81a: Merge "Fix bug #
8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
* commit '
c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e':
Fix bug #
8656546 API REVIEW: android.text.bidi / android.text
Kenny Root [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am
b5ec8c14: Change doc comment to match API change
* commit '
b5ec8c145d467abbc6eaf3306a5f6725e348ceec':
Change doc comment to match API change
Christopher Tate [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am
18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
* commit '
18414c4db7a2cd7d7b872e4cd4583bc8b7a4fcc0':
Provide SharedPreferences coherence guarantees for BackupAgent
Victoria Lease [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am
bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
* commit '
bcf3ec96a46aacba58af62ed963ebf1c812c8179':
do not attempt to parcel unknown ParcelableSpans
Dianne Hackborn [Sun, 21 Apr 2013 04:34:51 +0000 (21:34 -0700)]
am
b3bffa80: Merge "Follow up on issue #
8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev
* commit '
b3bffa8080c4b04285897d18f913cf6385b0e9e1':
Follow up on issue #
8159072: Spinner widget should be RTL'ized
Craig Mautner [Sun, 21 Apr 2013 04:34:51 +0000 (21:34 -0700)]
am
c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
* commit '
c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
Improve javadoc for rotationAnimation.
Selim Gurun [Sat, 20 Apr 2013 07:38:31 +0000 (00:38 -0700)]
am
a6854579: am
fa1f7d21: am
07c9c291: am
a2b0b35e: am
5fba3404: am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
a68545796da33bd7fde616958e6abc7548d0a975':
Revert "Add a delimiter between scheme and host"
Selim Gurun [Sat, 20 Apr 2013 07:35:29 +0000 (00:35 -0700)]
am
fa1f7d21: am
07c9c291: am
a2b0b35e: am
5fba3404: am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
fa1f7d21e97b7225f1e7553abc0eebe06cc79367':
Revert "Add a delimiter between scheme and host"
Selim Gurun [Sat, 20 Apr 2013 07:32:24 +0000 (00:32 -0700)]
am
07c9c291: am
a2b0b35e: am
5fba3404: am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
07c9c2912d1c7e19336d575f40f42eb12626b322':
Revert "Add a delimiter between scheme and host"
Selim Gurun [Sat, 20 Apr 2013 07:28:37 +0000 (00:28 -0700)]
am
a2b0b35e: am
5fba3404: am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
a2b0b35ed8f5c53866058f65ccf8c6e4aabef7af':
Revert "Add a delimiter between scheme and host"
Selim Gurun [Sat, 20 Apr 2013 07:25:06 +0000 (00:25 -0700)]
am
5fba3404: am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
5fba3404d3635fdd6bba9ba2fe7605851f07263f':
Revert "Add a delimiter between scheme and host"
Selim Gurun [Sat, 20 Apr 2013 07:22:01 +0000 (00:22 -0700)]
am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
3c4fa654801fcf51a92cefd62e28a020d39e08d0':
Revert "Add a delimiter between scheme and host"
Selim Gurun [Sat, 20 Apr 2013 07:19:41 +0000 (00:19 -0700)]
am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
679c8f689f6799d143719bb8eb839e2640bf9d07':
Revert "Add a delimiter between scheme and host"
Geremy Condra [Sat, 20 Apr 2013 06:59:00 +0000 (23:59 -0700)]
am
464be797: (-s ours) am
30504327: am
62588d79: am
8f87c5d8: am
ed1e5a87: am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
464be7975fa8938d7ab427789faa5e222bc6ab2c':
Add a delimiter between scheme and host
Geremy Condra [Sat, 20 Apr 2013 06:19:20 +0000 (23:19 -0700)]
am
30504327: am
62588d79: am
8f87c5d8: am
ed1e5a87: am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
30504327364a7ad641c09a227f7930b9fba91614':
Add a delimiter between scheme and host
Geremy Condra [Sat, 20 Apr 2013 06:17:45 +0000 (23:17 -0700)]
am
62588d79: am
8f87c5d8: am
ed1e5a87: am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
62588d794602f6e42e8143169d8ef170589797a1':
Add a delimiter between scheme and host
Geremy Condra [Sat, 20 Apr 2013 06:14:38 +0000 (23:14 -0700)]
am
8f87c5d8: am
ed1e5a87: am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
8f87c5d8d270bbc23738aea067b1bce2b7d08d02':
Add a delimiter between scheme and host
Geremy Condra [Sat, 20 Apr 2013 06:12:10 +0000 (23:12 -0700)]
am
ed1e5a87: am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
ed1e5a8702b172298b25937b9feb0da08804d440':
Add a delimiter between scheme and host
Stephen Hines [Sat, 20 Apr 2013 04:48:18 +0000 (04:48 +0000)]
Merge "Add new error code for Debug Context work." into jb-mr2-dev
Geremy Condra [Sat, 20 Apr 2013 04:38:06 +0000 (21:38 -0700)]
am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
b7787a317fc8bb163de04641a1423cd08324d4b8':
Add a delimiter between scheme and host
Jeff Brown [Sat, 20 Apr 2013 00:55:48 +0000 (00:55 +0000)]
Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev
Fabrice Di Meglio [Sat, 20 Apr 2013 00:42:19 +0000 (00:42 +0000)]
Merge "Fix bug #
8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
Fabrice Di Meglio [Fri, 19 Apr 2013 22:08:53 +0000 (15:08 -0700)]
Fix bug #
8656546 API REVIEW: android.text.bidi / android.text
- clean BidiFormatter APIs
Change-Id: I8591ce3c3e8f2de4138698aa14ddb38b933de5e1
Jeff Brown [Sat, 20 Apr 2013 00:13:33 +0000 (17:13 -0700)]
Revert all recent GLSurfaceView changes.
Several issues have been identified that will need to be
resolved carefully before we attempt to make similar changes.
1. Some applications make assumptions about the fact that all
Runnables posted with queueEvent() will be executed before
the next draw. Because the Choreographer may post messages
in the past (due at the frame time), these Runnables were
not always running at the expected time.
2. Some applications apparently hijack the GLThread and try
to run their own Looper on it. This obviously won't work
if we are already running one of our own.
We may need to add new rendering modes or target API checks
to provide an opportunity for applications to opt-in to the
changes in the future.
Bug:
8649804
Change-Id: I6289c3392a98cdbfaf28c7f4f7a8040f2138a3b4
Kenny Root [Fri, 19 Apr 2013 22:35:54 +0000 (15:35 -0700)]
Change doc comment to match API change
API change in
f0d4777473f25847d67fc17fc082fada08cf678d didn't update a
comment to match which caused doc build failures.
Bug:
8603279
Change-Id: I475dc569747ae5d34b4267537370f18446386bb9
Christopher Tate [Fri, 19 Apr 2013 22:34:01 +0000 (22:34 +0000)]
Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
Victoria Lease [Fri, 19 Apr 2013 22:33:42 +0000 (22:33 +0000)]
Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
Dianne Hackborn [Fri, 19 Apr 2013 22:18:12 +0000 (22:18 +0000)]
Merge "Follow up on issue #
8159072: Spinner widget should be RTL'ized" into jb-mr2-dev
Dianne Hackborn [Fri, 19 Apr 2013 21:09:37 +0000 (14:09 -0700)]
Follow up on issue #
8159072: Spinner widget should be RTL'ized
Only allow through changing direction configs for drawables.
Explicitly map layout direction values to an index in the
preload arrays.
Drawables that don't vary by configuration should go in to both
the rtl and ltr preloads.
Change-Id: Ib92dd11738082a795e02d1d4191adb54702d651c
Craig Mautner [Fri, 19 Apr 2013 21:30:20 +0000 (21:30 +0000)]
Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
Christopher Tate [Thu, 18 Apr 2013 23:57:43 +0000 (16:57 -0700)]
Provide SharedPreferences coherence guarantees for BackupAgent
SharedPreferences uses deferred writes internally, and the public
API doesn't allow apps to explicitly synchronize with this, so the
backup/restore implementation needs to take a little care to make
sure that the app process isn't killed before the deferred writes
land on disk. This parallels the coherence guarantees around
SharedPreference that the Activity and Service lifecycles provide.
Bug
8659368
Change-Id: I853e54f9fb0d2d260dbe6e40d640959f998092df
Christopher Tate [Fri, 19 Apr 2013 21:00:47 +0000 (14:00 -0700)]
am
a6a8ba84: Merge "Correct a small doc error"
* commit '
a6a8ba844cc47ab4eea204115788f050811f9335':
Correct a small doc error
Victoria Lease [Fri, 19 Apr 2013 20:12:15 +0000 (13:12 -0700)]
do not attempt to parcel unknown ParcelableSpans
Bug:
8639983
Change-Id: I27335f6e9d3a0671ecdd161fdbf765785ef8065d
Christopher Tate [Fri, 19 Apr 2013 20:37:31 +0000 (20:37 +0000)]
Merge "Correct a small doc error"
Jeff Tinker [Fri, 19 Apr 2013 20:35:40 +0000 (13:35 -0700)]
am
26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev
* commit '
26a54ecaa556f72086790caa133e5a8d31652d8a':
Correct algorithm property name and clarify javadoc description of device unique id property.
Jeff Sharkey [Fri, 19 Apr 2013 20:35:37 +0000 (13:35 -0700)]
am
ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev
* commit '
ca2a6374aadb95ca3f151d4bc2fdd3127f04e5e7':
Environment should only warn when asked.
Scott Kennedy [Fri, 19 Apr 2013 20:35:16 +0000 (13:35 -0700)]
Correct a small doc error
Change-Id: I2adcc169193452549e55ac10958f0e28216aeb15
Jeff Tinker [Fri, 19 Apr 2013 20:32:35 +0000 (20:32 +0000)]
Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev
Jeff Sharkey [Fri, 19 Apr 2013 20:32:25 +0000 (20:32 +0000)]
Merge "Environment should only warn when asked." into jb-mr2-dev
Adam Cohen [Fri, 19 Apr 2013 20:30:05 +0000 (13:30 -0700)]
am
12a7f76c: Merge "Fix system server crash when uninstalling paid LS widget that has been added (issue
8647398)" into jb-mr2-dev
* commit '
12a7f76c8687053d139d670631e7cef7031f8c48':
Fix system server crash when uninstalling paid LS widget that has been added (issue
8647398)
Jeff Sharkey [Fri, 19 Apr 2013 20:25:04 +0000 (13:25 -0700)]
Environment should only warn when asked.
Instead of warning on Process.SYSTEM_UID, which is also used by the
Settings app, change to have the parent process explicitly ask for
warnings.
Bug:
8667286
Change-Id: Ib26676694a4041ff4e6d3ffdcc14055b7eba13c7
Adam Cohen [Fri, 19 Apr 2013 20:26:02 +0000 (20:26 +0000)]
Merge "Fix system server crash when uninstalling paid LS widget that has been added (issue
8647398)" into jb-mr2-dev
Jason Sams [Fri, 19 Apr 2013 20:13:18 +0000 (13:13 -0700)]
am
0935f258: Merge "Updating API based on feedback" into jb-mr2-dev
* commit '
0935f258dc2fd1eeadf9d502abbd1e409f68ac67':
Updating API based on feedback
Jason Sams [Fri, 19 Apr 2013 20:09:55 +0000 (20:09 +0000)]
Merge "Updating API based on feedback" into jb-mr2-dev
Craig Mautner [Fri, 19 Apr 2013 20:06:53 +0000 (13:06 -0700)]
Improve javadoc for rotationAnimation.
Clarified use of rotationAnimation. Did not add a comment
for ROTATION_ANIMATION_CHANGED as that would be inconsistent
with the other twelve <parameter>_CHANGED flags that it
follows in the source code.
Fixes bug
8657715.
Change-Id: I03b5caf3d6a93ca0044f58485c94c7a600e835a8
Scott Main [Fri, 19 Apr 2013 20:05:45 +0000 (13:05 -0700)]
am
80b16639: am
b20a943a: am
7c0523d0: am
22881a14: am
3ef011d1: am
9ffe5dff: add email links for android branding bug:
8666523
* commit '
80b1663937462d8ade4eb0187325fb01cc77df3f':
add email links for android branding bug:
8666523
Scott Main [Fri, 19 Apr 2013 20:05:42 +0000 (13:05 -0700)]
am
3b4f85b7: am
e397020d: am
102e9e5a: am
1b95cc41: am
653a00e2: am
6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions
* commit '
3b4f85b715399dc044fbaafda37ce74863d55370':
search suggest tags for google service docs and exclude a whole bunch from suggestions
Scott Main [Fri, 19 Apr 2013 20:03:12 +0000 (13:03 -0700)]
am
b20a943a: am
7c0523d0: am
22881a14: am
3ef011d1: am
9ffe5dff: add email links for android branding bug:
8666523
* commit '
b20a943a4e389d8f95e39712ec5acc9c07bcdc47':
add email links for android branding bug:
8666523
Scott Main [Fri, 19 Apr 2013 20:03:04 +0000 (13:03 -0700)]
am
e397020d: am
102e9e5a: am
1b95cc41: am
653a00e2: am
6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions
* commit '
e397020d4d9144583d4dc05e1ed8ded254b21162':
search suggest tags for google service docs and exclude a whole bunch from suggestions
Scott Main [Fri, 19 Apr 2013 19:58:54 +0000 (12:58 -0700)]
am
7c0523d0: am
22881a14: am
3ef011d1: am
9ffe5dff: add email links for android branding bug:
8666523
* commit '
7c0523d099f9b27c2b1bbdc2ad9a770efd12e629':
add email links for android branding bug:
8666523
Scott Main [Fri, 19 Apr 2013 19:58:51 +0000 (12:58 -0700)]
am
102e9e5a: am
1b95cc41: am
653a00e2: am
6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions
* commit '
102e9e5adf6004dcd503b0ca331c1c2298a4e784':
search suggest tags for google service docs and exclude a whole bunch from suggestions
Jason Sams [Fri, 19 Apr 2013 19:56:37 +0000 (12:56 -0700)]
Updating API based on feedback
bug
8656887
This hides the methods used to support Camera
Fixes the oversight in LaunchControl
Documents some missing functions
Change-Id: I5b19b65dd5ddf9917100192c180bb63d89c80679
Scott Main [Fri, 19 Apr 2013 19:55:35 +0000 (12:55 -0700)]
am
22881a14: am
3ef011d1: am
9ffe5dff: add email links for android branding bug:
8666523
* commit '
22881a1479d172f8896ab1707453c9cc16abd986':
add email links for android branding bug:
8666523
Scott Main [Fri, 19 Apr 2013 19:55:32 +0000 (12:55 -0700)]
am
1b95cc41: am
653a00e2: am
6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions
* commit '
1b95cc41d097d4a1e070b949f46eb13e2fec887a':
search suggest tags for google service docs and exclude a whole bunch from suggestions
Scott Main [Fri, 19 Apr 2013 19:51:18 +0000 (12:51 -0700)]
am
3ef011d1: am
9ffe5dff: add email links for android branding bug:
8666523
* commit '
3ef011d18557d41964bb47b67d5526fc27d30295':
add email links for android branding bug:
8666523
Scott Main [Fri, 19 Apr 2013 19:51:15 +0000 (12:51 -0700)]
am
653a00e2: am
6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions
* commit '
653a00e240c618897932c3103dff49c5dbdfb196':
search suggest tags for google service docs and exclude a whole bunch from suggestions
Scott Main [Fri, 19 Apr 2013 19:47:29 +0000 (12:47 -0700)]
am
9ffe5dff: add email links for android branding bug:
8666523
* commit '
9ffe5dff76704dbd64ee101f12f32d07e69f95f4':
add email links for android branding bug:
8666523
Scott Main [Fri, 19 Apr 2013 19:47:26 +0000 (12:47 -0700)]
am
6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions
* commit '
6afeb0e5e7343bcafd9620bfc04c21cad9f08edb':
search suggest tags for google service docs and exclude a whole bunch from suggestions
Irfan Sheriff [Fri, 19 Apr 2013 19:47:05 +0000 (12:47 -0700)]
am
4a1d9513: Merge "Fix NPE issues seen by CTS" into jb-mr2-dev
* commit '
4a1d95139a57b8726fb168b08a5c54b9a134c8df':
Fix NPE issues seen by CTS
Amith Yamasani [Fri, 19 Apr 2013 19:47:01 +0000 (12:47 -0700)]
am
e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev
* commit '
e37c8f781abb045ec4a0b872e5e6afe48eee021a':
Improve API and documentation
Carlos Valdivia [Fri, 19 Apr 2013 19:46:59 +0000 (12:46 -0700)]
am
58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev
* commit '
58156b4123acf92f2a03885136a3b6859801f000':
Fix NPE when restarting ChooseTypeAndAccountActiivty.
Jeff Sharkey [Fri, 19 Apr 2013 19:46:56 +0000 (12:46 -0700)]
am
24b55f25: Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev
* commit '
24b55f25c18fbed6b5d10ed33ddaab269cf1a01e':
Deprecate StatFs methods returning small values.
Irfan Sheriff [Fri, 19 Apr 2013 19:43:46 +0000 (19:43 +0000)]
Merge "Fix NPE issues seen by CTS" into jb-mr2-dev
Amith Yamasani [Fri, 19 Apr 2013 19:10:02 +0000 (19:10 +0000)]
Merge "Improve API and documentation" into jb-mr2-dev
Amith Yamasani [Fri, 19 Apr 2013 01:40:07 +0000 (18:40 -0700)]
Improve API and documentation
API for querying accounts visible to a specific package.
Improve API and docs for device owner.
Bug:
8657158
Change-Id: I01b8701534f64b383391508a49ae93ed21f22ae0
Scott Main [Fri, 19 Apr 2013 18:40:48 +0000 (11:40 -0700)]
add email links for android branding
bug:
8666523
Change-Id: Iee2fe78d7b9ab46723cc3407b9a8eede822b359c
Carlos Valdivia [Fri, 19 Apr 2013 18:38:33 +0000 (18:38 +0000)]
Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev
Jeff Sharkey [Fri, 19 Apr 2013 18:21:08 +0000 (18:21 +0000)]
Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev
Daniel Sandler [Fri, 19 Apr 2013 18:03:31 +0000 (11:03 -0700)]
am
f535c820: Merge "Restore dock home support for car docks." into jb-mr2-dev
* commit '
f535c820c428d4eefffcb224f2572a9c5b9965ea':
Restore dock home support for car docks.
Fabrice Di Meglio [Fri, 19 Apr 2013 18:03:28 +0000 (11:03 -0700)]
am
b08aa235: Merge "Improve fix for bug #
8159072 Spinner widget should be RTL\'ized" into jb-mr2-dev
* commit '
b08aa2354ff3b1bd1c7d705b82a7c1e62674ee50':
Improve fix for bug #
8159072 Spinner widget should be RTL'ized
Daniel Sandler [Fri, 19 Apr 2013 18:00:17 +0000 (18:00 +0000)]
Merge "Restore dock home support for car docks." into jb-mr2-dev
Kenny Root [Fri, 19 Apr 2013 17:59:57 +0000 (10:59 -0700)]
am
eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev
* commit '
eddb9c891619c39f459d10b200eddb1f2932c96b':
Rename API AndroidKey* -> Key*
Irfan Sheriff [Fri, 19 Apr 2013 17:59:54 +0000 (10:59 -0700)]
am
63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev
* commit '
63e550f2026e749e7be5ab03655f0a5105457b9e':
Add getters and private constructor
Fabrice Di Meglio [Fri, 19 Apr 2013 17:59:51 +0000 (10:59 -0700)]
am
2623a24f: Merge "Fix bug #
8654490 android:paddingStart doesn\'t override android:paddingLeft" into jb-mr2-dev
* commit '
2623a24ffa4d75206757684b12b06318167f8788':
Fix bug #
8654490 android:paddingStart doesn't override android:paddingLeft
Fabrice Di Meglio [Fri, 19 Apr 2013 17:58:46 +0000 (17:58 +0000)]
Merge "Improve fix for bug #
8159072 Spinner widget should be RTL'ized" into jb-mr2-dev
Kenny Root [Fri, 19 Apr 2013 17:58:00 +0000 (17:58 +0000)]
Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 17:56:34 +0000 (17:56 +0000)]
Merge "Add getters and private constructor" into jb-mr2-dev
Philip Milne [Fri, 19 Apr 2013 17:56:22 +0000 (10:56 -0700)]
am
68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev
* commit '
68711f936381310fad783f2500e59dc2f272618a':
Revert "Simple MVC based binding mechanism for android controls."
Fabrice Di Meglio [Fri, 19 Apr 2013 17:56:22 +0000 (17:56 +0000)]
Merge "Fix bug #
8654490 android:paddingStart doesn't override android:paddingLeft" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 17:43:40 +0000 (10:43 -0700)]
Fix NPE issues seen by CTS
Bug:
8646305
Change-Id: Ief90c76d63f60aee9a3da080cd43dd9610f3f4fc
Philip Milne [Fri, 19 Apr 2013 17:53:23 +0000 (17:53 +0000)]
Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev
Jeff Sharkey [Thu, 18 Apr 2013 23:00:04 +0000 (16:00 -0700)]
Deprecate StatFs methods returning small values.
Bug:
8656794
Change-Id: Ic904bd1bc016ef48b5a304b7c68250afe23e98bc
Robert Greenwalt [Fri, 19 Apr 2013 17:17:41 +0000 (10:17 -0700)]
am
88cec86e: Remove STOPSHIP and defer removal.
* commit '
88cec86e882e27a9e35315553cc05fdf7f281a4e':
Remove STOPSHIP and defer removal.
Jeff Tinker [Fri, 19 Apr 2013 17:04:17 +0000 (10:04 -0700)]
Correct algorithm property name and clarify javadoc description of
device unique id property.
bug:
8603279
Change-Id: If56d568072b3c09e5f63901e285d0eaa3c77ff7a
Irfan Sheriff [Fri, 19 Apr 2013 16:29:34 +0000 (09:29 -0700)]
Add getters and private constructor
Address API feedback
Bug:
8656930
Change-Id: Idc3dd8d8a7e633449329864e41cab58a6b193b5a
Robert Greenwalt [Fri, 19 Apr 2013 16:31:24 +0000 (09:31 -0700)]
Remove STOPSHIP and defer removal.
bug:
8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
Irfan Sheriff [Fri, 19 Apr 2013 16:08:26 +0000 (09:08 -0700)]
am
9b3ebb12: Merge "Update API" into jb-mr2-dev
* commit '
9b3ebb124eba3d9f80ae299e0cbcfcd9c0a8653d':
Update API
Irfan Sheriff [Fri, 19 Apr 2013 16:05:15 +0000 (16:05 +0000)]
Merge "Update API" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 16:03:00 +0000 (09:03 -0700)]
Update API
Bug:
8656932
Change-Id: I09a8018f488d4e8ca3eb8c2a798669ebe016dfc8
Irfan Sheriff [Fri, 19 Apr 2013 15:57:45 +0000 (08:57 -0700)]
am
ba1311a3: Merge "Fix API name" into jb-mr2-dev
* commit '
ba1311a3f64efc9f22dea1ab5477002751e478dc':
Fix API name
Jean-Michel Trivi [Fri, 19 Apr 2013 15:57:43 +0000 (08:57 -0700)]
am
91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev
* commit '
91695a0cdc0aaab3d3f939d9adb8855938b4f69d':
Anti-drift in RCC playback position
Irfan Sheriff [Fri, 19 Apr 2013 15:56:10 +0000 (15:56 +0000)]
Merge "Fix API name" into jb-mr2-dev
Jean-Michel Trivi [Fri, 19 Apr 2013 15:55:28 +0000 (15:55 +0000)]
Merge "Anti-drift in RCC playback position" into jb-mr2-dev
Eric Laurent [Fri, 19 Apr 2013 15:42:42 +0000 (08:42 -0700)]
am
56af4f21: Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev
* commit '
56af4f212a21fe08b54de10322e023b09fa125aa':
AudioService: SCO audio backward compatibility
Irfan Sheriff [Fri, 19 Apr 2013 15:39:53 +0000 (08:39 -0700)]
Fix API name
Address council feedback
Bug:
8656932
Change-Id: I92972fc3672afbc38cdeee628c04b639053f7cf3
Eric Laurent [Fri, 19 Apr 2013 15:39:22 +0000 (15:39 +0000)]
Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev
OSDN Git Service
