OSDN Git Service
Jeff Tinker [Fri, 5 Apr 2013 01:26:28 +0000 (18:26 -0700)]
am
72e2307c: am
1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '
72e2307c6a84de5770dd1aa2943d3d609d29baf3':
Implement async event callout from drm plugin to Java app
Jeff Tinker [Fri, 5 Apr 2013 01:23:10 +0000 (18:23 -0700)]
am
1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '
1e0f36cffd8a4399fcd12e25bddde4544992bcb2':
Implement async event callout from drm plugin to Java app
Jeff Tinker [Fri, 5 Apr 2013 01:16:23 +0000 (01:16 +0000)]
Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
Geremy Condra [Fri, 5 Apr 2013 01:04:00 +0000 (01:04 +0000)]
Merge "Fix crash in ConfigUpdater when the target dir doesn't exist."
Geremy Condra [Fri, 5 Apr 2013 00:48:09 +0000 (17:48 -0700)]
Fix crash in ConfigUpdater when the target dir doesn't exist.
Change-Id: I44ee0e3791938da0bf890fb38cd886330c0ee01d
Nick Kralevich [Fri, 5 Apr 2013 00:34:31 +0000 (17:34 -0700)]
am
1fdaace1: am
80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev
* commit '
1fdaace1b17ad651d1e5266bb227a26e76b91a50':
Error on conflicting <uses-permission>
Nick Kralevich [Fri, 5 Apr 2013 00:34:29 +0000 (17:34 -0700)]
am
ecc5b436: am
745a42bb: Merge "aapt: add support for optional uses-permission" into jb-mr2-dev
* commit '
ecc5b4363571688cb257c2bc9c5e24653efb86f4':
aapt: add support for optional uses-permission
Nick Kralevich [Fri, 5 Apr 2013 00:27:44 +0000 (17:27 -0700)]
am
80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev
* commit '
80fdc9624e6d53a78031bf99d34e7c01d53ad66e':
Error on conflicting <uses-permission>
Nick Kralevich [Fri, 5 Apr 2013 00:27:42 +0000 (17:27 -0700)]
am
745a42bb: Merge "aapt: add support for optional uses-permission" into jb-mr2-dev
* commit '
745a42bbb9db8d54af5381ef5fe41828bf6fc352':
aapt: add support for optional uses-permission
Nick Kralevich [Fri, 5 Apr 2013 00:23:53 +0000 (00:23 +0000)]
Merge "Error on conflicting <uses-permission>" into jb-mr2-dev
Nick Kralevich [Fri, 5 Apr 2013 00:22:58 +0000 (00:22 +0000)]
Merge "aapt: add support for optional uses-permission" into jb-mr2-dev
Nick Kralevich [Thu, 4 Apr 2013 21:38:13 +0000 (14:38 -0700)]
Error on conflicting <uses-permission>
Don't install packages where we have multiple, conflicting
<uses-permission> lines for the same permission.
For example, a package which contains:
<uses-permission android:name="android.permission.INTERNET" android:required="false" />
<uses-permission android:name="android.permission.INTERNET" android:required="true" />
will now fail to install.
In addition, this change slightly refactors the code, and creates a new
parseUsesPermission() method.
Change-Id: I0f4bb8b51dc4a0c5b73458a70f706e19829275d2
Romain Guy [Thu, 4 Apr 2013 23:01:59 +0000 (16:01 -0700)]
am
21af446c: am
a151ef8c: Merge "First OpenGL ES 3.0 based optimization" into jb-mr2-dev
* commit '
21af446ce9704bdc465bf15755148c5de50ea019':
First OpenGL ES 3.0 based optimization
Romain Guy [Thu, 4 Apr 2013 22:57:56 +0000 (15:57 -0700)]
am
9ff408c1: am
faec826b: Merge "Reduce the size of dirty invalidates" into jb-mr2-dev
* commit '
9ff408c17be8cccc9820d46b207673be22bfbe84':
Reduce the size of dirty invalidates
Romain Guy [Thu, 4 Apr 2013 22:57:21 +0000 (15:57 -0700)]
am
a151ef8c: Merge "First OpenGL ES 3.0 based optimization" into jb-mr2-dev
* commit '
a151ef8c667a52d9fae28c09f780784f19bdb039':
First OpenGL ES 3.0 based optimization
Romain Guy [Thu, 4 Apr 2013 22:53:36 +0000 (15:53 -0700)]
am
faec826b: Merge "Reduce the size of dirty invalidates" into jb-mr2-dev
* commit '
faec826bd6051e41e1299cd14d580a4f50f6fe97':
Reduce the size of dirty invalidates
Romain Guy [Thu, 4 Apr 2013 22:47:53 +0000 (22:47 +0000)]
Merge "First OpenGL ES 3.0 based optimization" into jb-mr2-dev
Romain Guy [Thu, 4 Apr 2013 22:47:49 +0000 (22:47 +0000)]
Merge "Reduce the size of dirty invalidates" into jb-mr2-dev
Chris Craik [Thu, 4 Apr 2013 22:35:06 +0000 (15:35 -0700)]
am
233f6730: am
de4f8c38: Merge "Traverse layers in update order" into jb-mr2-dev
* commit '
233f67302e7d35242613c5d4502459b085868595':
Traverse layers in update order
Chris Craik [Thu, 4 Apr 2013 22:32:54 +0000 (15:32 -0700)]
am
de4f8c38: Merge "Traverse layers in update order" into jb-mr2-dev
* commit '
de4f8c3872c6284605c168687c69ebfa72ea49d2':
Traverse layers in update order
Romain Guy [Thu, 4 Apr 2013 22:26:04 +0000 (15:26 -0700)]
Reduce the size of dirty invalidates
Remove remnants from times long gone. We don't need to redraw the
union of the previous frame's dirty region and the new dirty
region.
Change-Id: I9fb96f99a6a72c2233f9ca563cf6432a42b2b65b
Chris Craik [Thu, 4 Apr 2013 22:26:59 +0000 (22:26 +0000)]
Merge "Traverse layers in update order" into jb-mr2-dev
Chris Craik [Thu, 4 Apr 2013 21:46:24 +0000 (14:46 -0700)]
Traverse layers in update order
bug:
8540150
Layers now require traversal in update order, as it will be child
first, then parent for layer-in-layer
Fixes issue with deferred layer playback not flushing in order, and
thus child not painting before parent
Also fixes DisplayList to only be cleared after flush in deferred list
Change-Id: I2f284d00079cdb20798aeef6a1c94e823940db40
Fabrice Di Meglio [Thu, 4 Apr 2013 21:26:41 +0000 (14:26 -0700)]
am
378b7b7b: am
5a78b1b2: Merge "Fix for bug #
8146846 Phone App should be mirrored for RTL languages" into jb-mr2-dev
* commit '
378b7b7bc7467fbfe756b5dd0c3480735a49e98f':
Fix for bug #
8146846 Phone App should be mirrored for RTL languages
Fabrice Di Meglio [Thu, 4 Apr 2013 21:22:35 +0000 (14:22 -0700)]
am
5a78b1b2: Merge "Fix for bug #
8146846 Phone App should be mirrored for RTL languages" into jb-mr2-dev
* commit '
5a78b1b20d1f137f867bd1dba76377a41af1af18':
Fix for bug #
8146846 Phone App should be mirrored for RTL languages
Fabrice Di Meglio [Thu, 4 Apr 2013 21:16:43 +0000 (21:16 +0000)]
Merge "Fix for bug #
8146846 Phone App should be mirrored for RTL languages" into jb-mr2-dev
Nick Kralevich [Thu, 4 Apr 2013 20:36:04 +0000 (13:36 -0700)]
am
2c0283f5: am
b2c3aa8e: Merge "PackageParser: ignore <uses-permission> android:required on older apps" into jb-mr2-dev
* commit '
2c0283f5d1bc43892b2e1e6ad3b111e4933bbe34':
PackageParser: ignore <uses-permission> android:required on older apps
Nick Kralevich [Thu, 4 Apr 2013 20:32:58 +0000 (13:32 -0700)]
am
b2c3aa8e: Merge "PackageParser: ignore <uses-permission> android:required on older apps" into jb-mr2-dev
* commit '
b2c3aa8e322a4c08e3aca3a877da3732ec93e042':
PackageParser: ignore <uses-permission> android:required on older apps
Nick Kralevich [Thu, 4 Apr 2013 20:27:32 +0000 (20:27 +0000)]
Merge "PackageParser: ignore <uses-permission> android:required on older apps" into jb-mr2-dev
Nick Kralevich [Thu, 4 Apr 2013 20:19:10 +0000 (13:19 -0700)]
PackageParser: ignore <uses-permission> android:required on older apps
Don't honor <uses-permission android:required="false"> on older apps.
Lots of apps in the wild are improperly using this, and we don't
want to break them.
Bug:
8528162
Change-Id: I6e0a10bc9feac58d13ef624239c6b91e9fc34590
Romain Guy [Thu, 4 Apr 2013 19:27:54 +0000 (12:27 -0700)]
First OpenGL ES 3.0 based optimization
This change uses a new OpenGL ES 3.0 feature to upload less data when
the font cache needs to be update. This can result in significant
performance improvements on device with large textures or with locales
that use a lot of glyphs (CJK for instance.)
This change also fixes various unpack alignment issues. The unpack
alignment, as well as the unpack row length, is not texture specific
but a global state that affect all glTex/SubImage2D calls. Some of
them were missing the appropriate glPixelStorei() call. This could
result in corrupted textures.
Change-Id: Iefb429d4d0d0b4e0faeadf27daafee6d30a21d85
Chet Haase [Thu, 4 Apr 2013 18:33:56 +0000 (11:33 -0700)]
am
98f69881: am
77d94957: Merge "Adding small animation features" into jb-mr2-dev
* commit '
98f69881ce28fef261da45c7fbd7ee79e9b8d637':
Adding small animation features
Chet Haase [Thu, 4 Apr 2013 18:30:31 +0000 (11:30 -0700)]
am
77d94957: Merge "Adding small animation features" into jb-mr2-dev
* commit '
77d94957d793aba16a1352d25d5555bf59fe74e7':
Adding small animation features
Chet Haase [Thu, 4 Apr 2013 18:24:46 +0000 (18:24 +0000)]
Merge "Adding small animation features" into jb-mr2-dev
Adam Powell [Thu, 4 Apr 2013 18:10:24 +0000 (11:10 -0700)]
am
2987c218: am
728827ff: Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev
* commit '
2987c218e351c76941f09bddb3eb46a572ca6644':
Uphold common ordering expectations around action bar Home/Up dispatch
Adam Powell [Thu, 4 Apr 2013 18:05:31 +0000 (11:05 -0700)]
am
728827ff: Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev
* commit '
728827ff472b72ed7a86971ed8e35a01ce5bc8bf':
Uphold common ordering expectations around action bar Home/Up dispatch
Romain Guy [Thu, 4 Apr 2013 18:03:19 +0000 (11:03 -0700)]
am
ae74f598: am
eaadd123: Merge "Add internal API to query GL version number" into jb-mr2-dev
* commit '
ae74f59856d4f790c173857bb8024291d585861d':
Add internal API to query GL version number
Chet Haase [Tue, 2 Apr 2013 22:10:58 +0000 (15:10 -0700)]
Adding small animation features
RectEvaluator is useful when animating object bounds.
The other change is a hidden API that allows temporary suspension
of layout, useful for animations which need to animate view bounds
without conflicting with layout passes that might happen in the middle
of the animation.
Change-Id: I3dc08cb6ec455dfa3409e825506b218d3ea63d7a
Romain Guy [Thu, 4 Apr 2013 17:58:33 +0000 (10:58 -0700)]
am
eaadd123: Merge "Add internal API to query GL version number" into jb-mr2-dev
* commit '
eaadd123a7d7b0a02046db33e882ddcef33e1a49':
Add internal API to query GL version number
Adam Powell [Thu, 4 Apr 2013 17:58:26 +0000 (17:58 +0000)]
Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev
Romain Guy [Thu, 4 Apr 2013 17:53:06 +0000 (17:53 +0000)]
Merge "Add internal API to query GL version number" into jb-mr2-dev
Adam Powell [Thu, 4 Apr 2013 17:47:52 +0000 (10:47 -0700)]
Uphold common ordering expectations around action bar Home/Up dispatch
Some apps aren't particularly happy if a stray key event is dispatched
to a newly created window before its menu is prepared, causing the
action bar's Home/Up event to be dispatched. Ignore these clicks on
the Home/Up button before the menu goes through its initial prepare
step.
Note that it is still possible (and valid!) for Home/Up to be
dispatched even if the app chose to return false from
onCreateOptionsMenu or similar.
Bug
7085070
Change-Id: If4b7d5f8c5a08ce8a094f1919347604d78ddedfb
Romain Guy [Sat, 30 Mar 2013 01:32:29 +0000 (18:32 -0700)]
Add internal API to query GL version number
Change-Id: Idc02efc237b8e97445a9bab05c291bf193c7f279
Dan Morrill [Fri, 29 Mar 2013 01:10:43 +0000 (18:10 -0700)]
Phase 1 of refactoring SystemServer.
SystemServer is currently a monolithic class that brings up key system
services. This change is the first phase of refactoring it to be more
configurable. Specifically, it adds a set of on/off switches used to control
startup of individual services. Future plans include finer grained controls
and a more explicit and consistent startup sequence for these services.
Change-Id: I7299f5ce7d7b74a34eb56dffb788366fbc058532
Victoria Lease [Thu, 4 Apr 2013 14:50:49 +0000 (07:50 -0700)]
am
1e2c967b: am
8712e4cc: Merge "use libphonenumber for Linkify.PHONE_NUMBER" into jb-mr2-dev
* commit '
1e2c967b16afc0750d9d00fbaed8e2175937e1f4':
use libphonenumber for Linkify.PHONE_NUMBER
Victoria Lease [Thu, 4 Apr 2013 14:47:35 +0000 (07:47 -0700)]
am
8712e4cc: Merge "use libphonenumber for Linkify.PHONE_NUMBER" into jb-mr2-dev
* commit '
8712e4cc4a08f9d54013e96cc2420637c2114f08':
use libphonenumber for Linkify.PHONE_NUMBER
Victoria Lease [Thu, 4 Apr 2013 14:40:52 +0000 (14:40 +0000)]
Merge "use libphonenumber for Linkify.PHONE_NUMBER" into jb-mr2-dev
Victoria Lease [Mon, 1 Apr 2013 17:22:00 +0000 (10:22 -0700)]
use libphonenumber for Linkify.PHONE_NUMBER
This commit replaces a regex pattern match for Linkify.PHONE_NUMBER
with a call to libphonenumber's PhoneNumberUtil.findNumbers().
Bug:
5533245
Change-Id: I0e0563b241fb62e77d7f49e4a8484c6b0685dd8f
Jeff Sharkey [Thu, 4 Apr 2013 06:17:34 +0000 (23:17 -0700)]
am
07e8fc89: am
9059d377: Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev
* commit '
07e8fc89b0acec9045db9f6ae3fd7730657ae850':
Nuke heavy parts of notification before archiving.
Jeff Sharkey [Thu, 4 Apr 2013 06:13:56 +0000 (23:13 -0700)]
am
9059d377: Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev
* commit '
9059d3775ab47b08d08ec5df1be149be52007f96':
Nuke heavy parts of notification before archiving.
Jeff Sharkey [Thu, 4 Apr 2013 06:09:34 +0000 (06:09 +0000)]
Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev
Ying Wang [Thu, 4 Apr 2013 06:05:07 +0000 (23:05 -0700)]
Ying Wang [Thu, 4 Apr 2013 06:02:01 +0000 (23:02 -0700)]
Ying Wang [Thu, 4 Apr 2013 05:57:31 +0000 (22:57 -0700)]
Fix doc build.
Change-Id: I954a45866d968b0571040ba99cc93b818d02aeb5
Fabrice Di Meglio [Thu, 4 Apr 2013 04:01:58 +0000 (21:01 -0700)]
Fix for bug #
8146846 Phone App should be mirrored for RTL languages
- add RTL version of quickcontact badge overlay
Change-Id: I007d0dae9ceec9c42684e45a735ea6b06aa6f9a0
Matthew Xie [Thu, 4 Apr 2013 03:23:54 +0000 (20:23 -0700)]
am
3f84b7b1: am
26cd4d65: Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev
* commit '
3f84b7b17df5e4b020fd67351efdb30635372e69':
Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
Matthew Xie [Thu, 4 Apr 2013 03:19:51 +0000 (20:19 -0700)]
am
26cd4d65: Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev
* commit '
26cd4d658f5c4e99c31107cef78698c818e54577':
Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
Matthew Xie [Thu, 4 Apr 2013 03:16:39 +0000 (03:16 +0000)]
Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev
kmccormick [Thu, 4 Apr 2013 01:53:00 +0000 (18:53 -0700)]
am
2ce80a82: am
fb9a9713: am
614c155f: am
f64ad28f: am
15ebf622: am
f614d536: am
e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '
2ce80a82ed5a6dc026ee4e6fd7fe2775976862bc':
Doc update: clean up text and code snippets
kmccormick [Thu, 4 Apr 2013 01:49:14 +0000 (18:49 -0700)]
am
fb9a9713: am
614c155f: am
f64ad28f: am
15ebf622: am
f614d536: am
e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '
fb9a9713f44f61958c02fb8af72fd6a61d44f2e7':
Doc update: clean up text and code snippets
kmccormick [Thu, 4 Apr 2013 01:45:29 +0000 (18:45 -0700)]
am
614c155f: am
f64ad28f: am
15ebf622: am
f614d536: am
e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '
614c155fc6e4c3e83b152398df0e628d7a7f4051':
Doc update: clean up text and code snippets
Ben Gruver [Thu, 4 Apr 2013 01:45:22 +0000 (18:45 -0700)]
Fix issue with intent firewall merge
Change-Id: I936d0f68ffa9af5d4520f598eabb873f48c04132
kmccormick [Thu, 4 Apr 2013 01:41:54 +0000 (18:41 -0700)]
am
f64ad28f: am
15ebf622: am
f614d536: am
e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '
f64ad28f6b3c56c054f938680c58b69cf7237b2c':
Doc update: clean up text and code snippets
kmccormick [Thu, 4 Apr 2013 01:38:05 +0000 (18:38 -0700)]
am
15ebf622: am
f614d536: am
e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '
15ebf622de39e1a8c7d8855f5b4ede35039a2b2b':
Doc update: clean up text and code snippets
kmccormick [Thu, 4 Apr 2013 01:35:46 +0000 (18:35 -0700)]
am
f614d536: am
e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '
f614d53664b78f0fb386bbea93f4513c92786ff1':
Doc update: clean up text and code snippets
kmccormick [Thu, 4 Apr 2013 01:32:36 +0000 (18:32 -0700)]
am
e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '
e4922f28b4d3c1f6ff166a6e5d5849c8533562ea':
Doc update: clean up text and code snippets
kmccormick [Thu, 4 Apr 2013 01:28:53 +0000 (01:28 +0000)]
Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 01:16:15 +0000 (18:16 -0700)]
Doc update: clean up text and code snippets
"Bug:
6942838"
Change-Id: I496cbcd4b6236b5bc8a41484890f96721ba598a0
kmccormick [Thu, 4 Apr 2013 01:24:39 +0000 (18:24 -0700)]
am
7279f580: am
9b9c8957: am
b2961bd6: am
8f662f12: am
026625ff: am
72146342: am
e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '
7279f58064450089e313a0880bed4d6383cce5e2':
Doc update: typo in widget design doc
kmccormick [Thu, 4 Apr 2013 01:21:11 +0000 (18:21 -0700)]
am
9b9c8957: am
b2961bd6: am
8f662f12: am
026625ff: am
72146342: am
e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '
9b9c895774d53e14b42957c2bcd8c39ae2c79fb1':
Doc update: typo in widget design doc
Matthew Xie [Wed, 3 Apr 2013 07:29:27 +0000 (00:29 -0700)]
Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
Change name of BluetoothDevice#connectGattServer to BluetoothDevice#connectGatt
Add BluetoothGatt#getDevice to retrieve device from BluetoothGatt
Add BluetoothGatt#connect() to reconnect back to the server.
Make BluetoothGatt#close() public to clean up/unregister callback
Add BluetoothDevice.getType() to return int of
bug
8529188
Change-Id: Iebd9ac68cc7a64c43972e617dd3068f66c8ea0b2
kmccormick [Thu, 4 Apr 2013 01:16:32 +0000 (18:16 -0700)]
am
b2961bd6: am
8f662f12: am
026625ff: am
72146342: am
e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '
b2961bd6833697baac52888765fe8518133f489e':
Doc update: typo in widget design doc
kmccormick [Thu, 4 Apr 2013 01:14:08 +0000 (18:14 -0700)]
am
22da6f04: am
e10b600d: am
984f94ee: am
f29ca256: am
57b73b4a: am
72da7af6: am
b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '
22da6f04b33173be9e6aacabc29869998395d271':
Doc update: unterminated code tags
kmccormick [Thu, 4 Apr 2013 01:12:48 +0000 (18:12 -0700)]
am
8f662f12: am
026625ff: am
72146342: am
e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '
8f662f125edf393943fa7cceaf4758aae0534841':
Doc update: typo in widget design doc
kmccormick [Thu, 4 Apr 2013 01:10:40 +0000 (18:10 -0700)]
am
e10b600d: am
984f94ee: am
f29ca256: am
57b73b4a: am
72da7af6: am
b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '
e10b600d5da413f9633ed97aefcdbd3f949637a5':
Doc update: unterminated code tags
kmccormick [Thu, 4 Apr 2013 01:08:32 +0000 (18:08 -0700)]
am
026625ff: am
72146342: am
e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '
026625ffd5f256997f5bda87d39afe10152f5a9e':
Doc update: typo in widget design doc
kmccormick [Thu, 4 Apr 2013 01:06:40 +0000 (18:06 -0700)]
am
984f94ee: am
f29ca256: am
57b73b4a: am
72da7af6: am
b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '
984f94ee4c4ef0196d9b2c149d0a42f20b72bebf':
Doc update: unterminated code tags
kmccormick [Thu, 4 Apr 2013 01:06:02 +0000 (18:06 -0700)]
am
72146342: am
e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '
72146342cbe9ac1e1efffe90fa64d7f4026cf359':
Doc update: typo in widget design doc
kmccormick [Thu, 4 Apr 2013 01:05:49 +0000 (18:05 -0700)]
am
7c513867: am
c0425eec: am
ea19228d: am
69b7a1cb: am
2456a3fa: am
7c4b45ec: am
7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '
7c513867bb46b23cec737182a93589e1a9e01a51':
Doc update: getString -> getInt
Jeff Brown [Thu, 4 Apr 2013 01:05:41 +0000 (18:05 -0700)]
am
6d21e404: am
41c07671: Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev
* commit '
6d21e404ce834779b061fb519d85c9f95dccfd3d':
Clear mCurSender when mCurChannel is modified.
The Android Open Source Project [Thu, 4 Apr 2013 01:05:35 +0000 (18:05 -0700)]
am
2bd80b10: Reconcile with jb-mr2-release - do not merge
* commit '
2bd80b1042554a5579d13d9af9cea56755f211e5':
kmccormick [Thu, 4 Apr 2013 01:03:31 +0000 (18:03 -0700)]
am
e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '
e40b0810d9200c3de7e75ed3d311c8697bccd0a3':
Doc update: typo in widget design doc
kmccormick [Thu, 4 Apr 2013 01:03:00 +0000 (18:03 -0700)]
am
f29ca256: am
57b73b4a: am
72da7af6: am
b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '
f29ca256a4340a3d550d2c4a39a2e6a29a3ce850':
Doc update: unterminated code tags
kmccormick [Thu, 4 Apr 2013 01:00:11 +0000 (18:00 -0700)]
am
57b73b4a: am
72da7af6: am
b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '
57b73b4a1d6ea84ae42c407ecb258829ab8dfa2c':
Doc update: unterminated code tags
kmccormick [Thu, 4 Apr 2013 00:59:08 +0000 (00:59 +0000)]
Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:58:30 +0000 (17:58 -0700)]
am
72da7af6: am
b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '
72da7af68a86e61281ba0af0e159fb480913ae74':
Doc update: unterminated code tags
kmccormick [Thu, 4 Apr 2013 00:56:58 +0000 (17:56 -0700)]
Doc update: typo in widget design doc
"Bug:
7042997"
Change-Id: I89d60c42bb846514ad6792fb4a901698128a21b6
kmccormick [Thu, 4 Apr 2013 00:55:50 +0000 (17:55 -0700)]
am
b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '
b461a13f252e3888b8614a8f363f34731274e87e':
Doc update: unterminated code tags
kmccormick [Thu, 4 Apr 2013 00:52:26 +0000 (00:52 +0000)]
Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
Ben Gruver [Thu, 4 Apr 2013 00:41:37 +0000 (17:41 -0700)]
resolved conflicts for merge of
2ab72e1f to master
Change-Id: I752332dfb1a2f15bac22d3f1a457ae1ef20cf240
kmccormick [Thu, 4 Apr 2013 00:28:14 +0000 (17:28 -0700)]
Doc update: unterminated code tags
"Bug:
7250069"
Change-Id: I4c3eca8eacad6d0aced9f38788726ba95b914d5d
kmccormick [Thu, 4 Apr 2013 00:41:21 +0000 (17:41 -0700)]
am
c0425eec: am
ea19228d: am
69b7a1cb: am
2456a3fa: am
7c4b45ec: am
7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '
c0425eecbd1a4182f1dce2f99af8bf4e39f376d2':
Doc update: getString -> getInt
kmccormick [Thu, 4 Apr 2013 00:37:20 +0000 (17:37 -0700)]
am
ea19228d: am
69b7a1cb: am
2456a3fa: am
7c4b45ec: am
7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '
ea19228daabf42b4aa30d0b43638ddd5a4e3d6d5':
Doc update: getString -> getInt
kmccormick [Thu, 4 Apr 2013 00:33:59 +0000 (17:33 -0700)]
am
69b7a1cb: am
2456a3fa: am
7c4b45ec: am
7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '
69b7a1cb9a75374867f9d13117312335f11fe593':
Doc update: getString -> getInt
kmccormick [Thu, 4 Apr 2013 00:31:38 +0000 (17:31 -0700)]
am
2456a3fa: am
7c4b45ec: am
7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '
2456a3fa3871c45378d2ad35d986cc9fa68bb5ed':
Doc update: getString -> getInt
kmccormick [Thu, 4 Apr 2013 00:29:35 +0000 (17:29 -0700)]
am
7c4b45ec: am
7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '
7c4b45ec0ede9b485446367ead5c54fac734c26a':
Doc update: getString -> getInt
kmccormick [Thu, 4 Apr 2013 00:26:42 +0000 (17:26 -0700)]
am
7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '
7f932e88d61b977be48e2f6157f8de64c89400d9':
Doc update: getString -> getInt
kmccormick [Thu, 4 Apr 2013 00:23:30 +0000 (00:23 +0000)]
Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:19:50 +0000 (17:19 -0700)]
Doc update: getString -> getInt
"Bug:
7426857"
Change-Id: I0535b38f57c21a1951f45f428ca327f2cbdcb50a
Jeff Brown [Thu, 4 Apr 2013 00:03:40 +0000 (17:03 -0700)]
am
41c07671: Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev
* commit '
41c076715da58990dc9b0be749bba28fc75d3b78':
Clear mCurSender when mCurChannel is modified.
OSDN Git Service
