OSDN Git Service
Elliott Hughes [Thu, 6 Jun 2013 20:53:54 +0000 (13:53 -0700)]
am
70b74646: Merge "Track libcore changes."
* commit '
70b74646b8114b7ee9e35ce4283ecab8c8528dcc':
Track libcore changes.
Elliott Hughes [Thu, 6 Jun 2013 20:51:30 +0000 (20:51 +0000)]
Merge "Track libcore changes."
Elliott Hughes [Thu, 6 Jun 2013 20:40:21 +0000 (13:40 -0700)]
Track libcore changes.
Bug:
3484927
Change-Id: I3a3c4a9f0ad6055261f705987bc576cd28bebb46
Elliott Hughes [Wed, 5 Jun 2013 23:23:34 +0000 (16:23 -0700)]
am
fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format"
* commit '
fa6d6256e9052a5f5155ac97364170f6518e37a4':
change "next" to "done" in minute IME option under 24-hour format
Elliott Hughes [Wed, 5 Jun 2013 23:20:37 +0000 (23:20 +0000)]
Merge "change "next" to "done" in minute IME option under 24-hour format"
The Android Open Source Project [Mon, 3 Jun 2013 23:43:46 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ib4adc6b9ad37713ec04b6cacce5279e12395e3a6
Robert Greenwalt [Sat, 1 Jun 2013 17:59:29 +0000 (10:59 -0700)]
Apply scan-always setting to initial wifi state.
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.
bug:
9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
Joe Malin [Mon, 3 Jun 2013 21:31:21 +0000 (14:31 -0700)]
am
423f8a8c: am
2618ac55: am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
423f8a8c21ec4e702e72ffce27bb3b5481170bae':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:27:50 +0000 (14:27 -0700)]
am
2618ac55: am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
2618ac55a94a97e29abd9defa93dea30e067b4e4':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:23:08 +0000 (14:23 -0700)]
am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
a37bda7b616452d0072b012cc7ae8fcae51e943f':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:20:45 +0000 (14:20 -0700)]
am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
468d82bb7150996c8b2b4228d0e8d031f74e304b':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:18:22 +0000 (14:18 -0700)]
am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
6bf45dc773de186b68af3cc9fdc275acbd3d86aa':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:17:15 +0000 (14:17 -0700)]
am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
b6a35268ccb698cde6d2e1e2f475a7299112b034':
B9257437: Typo in javadoc for AccountManager
Baligh Uddin [Mon, 3 Jun 2013 21:15:52 +0000 (14:15 -0700)]
am
26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
26fe0761e3e275347c06f9224e24ab7a31ff23e8':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:14:23 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
The Android Open Source Project [Mon, 3 Jun 2013 21:02:50 +0000 (14:02 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60
Joe Malin [Mon, 3 Jun 2013 16:49:04 +0000 (09:49 -0700)]
B9257437: Typo in javadoc for AccountManager
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
Scott Main [Mon, 3 Jun 2013 18:35:02 +0000 (11:35 -0700)]
am
3c080baa: am
564889b1: am
4a024be4: am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
3c080baad5609faa663238f202c7aae7268bbd2c':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:33:13 +0000 (11:33 -0700)]
am
564889b1: am
4a024be4: am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
564889b1263bb1c5cfcd21401f853b0cc1569a50':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:17:15 +0000 (11:17 -0700)]
am
4a024be4: am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
4a024be4de71f90eaaff7be8122926bdc9297d38':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:15:16 +0000 (11:15 -0700)]
am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
4cef8150c83ce60a4d3acc495132357fb9bd1458':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:12:54 +0000 (18:12 +0000)]
Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
Baligh Uddin [Mon, 3 Jun 2013 16:11:49 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I455b359698e9bf43d7065374241783fa1f06faca
Auto-generated-cl: translation import
Scott Main [Mon, 3 Jun 2013 16:06:19 +0000 (09:06 -0700)]
update dashbord for 6/3
Change-Id: I73f340be032d6a45ccc20c80f03849b018f650e5
John Spurlock [Mon, 3 Jun 2013 15:52:56 +0000 (08:52 -0700)]
am
0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev
* commit '
0c2c62b29d191d41129e3dc5451f07ce0ef6985f':
Fix awkward wording in AppWidgetManager docs.
John Spurlock [Mon, 3 Jun 2013 15:50:43 +0000 (15:50 +0000)]
Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev
Andreas Huber [Mon, 3 Jun 2013 15:46:20 +0000 (08:46 -0700)]
am
be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
* commit '
be22605d1eacfb4137b6984b72a3eda004b911a1':
Listen for HTTP proxy changes and propagate the information to the media
Andreas Huber [Mon, 3 Jun 2013 15:44:16 +0000 (15:44 +0000)]
Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
Robert Greenwalt [Mon, 3 Jun 2013 15:41:48 +0000 (08:41 -0700)]
am
05caa2a3: Apply scan-always setting to initial wifi state.
* commit '
05caa2a3de32e54562d1ec3031f73ef5392cfb40':
Apply scan-always setting to initial wifi state.
John Spurlock [Mon, 3 Jun 2013 15:38:48 +0000 (11:38 -0400)]
Fix awkward wording in AppWidgetManager docs.
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
The Android Automerger [Mon, 3 Jun 2013 12:55:11 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 2 Jun 2013 12:55:28 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Robert Greenwalt [Sat, 1 Jun 2013 17:59:29 +0000 (10:59 -0700)]
Apply scan-always setting to initial wifi state.
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.
bug:
9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
Robert Greenwalt [Sat, 1 Jun 2013 15:58:16 +0000 (08:58 -0700)]
am
0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev
* commit '
0161d229fdbd8407f5b8b783ffa02b145b0cef8e':
Remember wifi country that's set before boot
Robert Greenwalt [Sat, 1 Jun 2013 15:57:12 +0000 (15:57 +0000)]
Merge "Remember wifi country that's set before boot" into jb-mr2-dev
Dirk Dougherty [Sat, 1 Jun 2013 15:35:13 +0000 (08:35 -0700)]
am
8ebfb8c9: am
fdc0c861: am
b18c7254: am
a404a629: am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
8ebfb8c9c34caa80cd0d2451d950170c1b522f2a':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Dirk Dougherty [Sat, 1 Jun 2013 15:32:11 +0000 (08:32 -0700)]
am
fdc0c861: am
b18c7254: am
a404a629: am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
fdc0c8618b4e51c322f747202ff94508124e7c9c':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Dirk Dougherty [Sat, 1 Jun 2013 15:28:48 +0000 (08:28 -0700)]
am
b18c7254: am
a404a629: am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
b18c725442e498a6447de37c3b9428b09837eda9':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Wink Saville [Sat, 1 Jun 2013 15:27:41 +0000 (08:27 -0700)]
am
8ca5d64a: am
39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"
* commit '
8ca5d64a39395ef6d9f800e843ef706c7ab8bf51':
Fixing crash in PhoneNumberUtils getNumberFromIntent
Dirk Dougherty [Sat, 1 Jun 2013 15:26:32 +0000 (08:26 -0700)]
am
a404a629: am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
a404a62951ad8a2d657a587feb12780e725296e3':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Dirk Dougherty [Sat, 1 Jun 2013 15:24:12 +0000 (08:24 -0700)]
am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
6fe992d88abc1c8c75ede638e6b0d52cd06f098f':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Jason Sams [Sat, 1 Jun 2013 15:23:22 +0000 (08:23 -0700)]
am
413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev
* commit '
413adc9260d700bd8143950951c4e1ad07cbeddf':
Fix free after use with createFromBitmapResource
Baligh Uddin [Sat, 1 Jun 2013 15:23:19 +0000 (08:23 -0700)]
am
51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
51e01f9ec058f34a27de7687ceddf4eb0e6b7d9d':
Import translations. DO NOT MERGE
Jim Miller [Sat, 1 Jun 2013 15:23:17 +0000 (08:23 -0700)]
am
00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev
* commit '
00d4c94625226ab325def94e9b82074f39572b43':
Fix keyguard issue where an incoming SMS would switch widget
Wink Saville [Sat, 1 Jun 2013 15:23:02 +0000 (08:23 -0700)]
am
39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"
* commit '
39136d391ab04e93fd0a01b760e57b6ea079cf4c':
Fixing crash in PhoneNumberUtils getNumberFromIntent
Dirk Dougherty [Sat, 1 Jun 2013 15:21:25 +0000 (08:21 -0700)]
am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
4fad5c176a245203c1f8d26397ef6cc838753357':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Wink Saville [Sat, 1 Jun 2013 14:09:53 +0000 (14:09 +0000)]
Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"
Robert Greenwalt [Sat, 1 Jun 2013 00:57:10 +0000 (17:57 -0700)]
Remember wifi country that's set before boot
Telehony seems to sometimes be reporting the country before boot
is completed so can't persist the data at that time. Remember
and write it on BOOT_COMPLETED
Also, there are permission issues around writing the setting.
bug:
9225156
Change-Id: Ifdf2243da71b0d2ce5743267842597937d790ef5
Jason Sams [Sat, 1 Jun 2013 00:54:17 +0000 (00:54 +0000)]
Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev
Baligh Uddin [Fri, 31 May 2013 22:30:29 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Jim Miller [Fri, 31 May 2013 21:41:34 +0000 (21:41 +0000)]
Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev
Andreas Huber [Tue, 28 May 2013 21:39:39 +0000 (14:39 -0700)]
Listen for HTTP proxy changes and propagate the information to the media
framework.
related-to-bug:
8873723
Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda
(cherry picked from commit
bfe9154142428aa8abecaf943dfeffc55f411ea7)
Dirk Dougherty [Fri, 31 May 2013 21:08:45 +0000 (21:08 +0000)]
Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
Jason Sams [Fri, 31 May 2013 21:00:46 +0000 (14:00 -0700)]
Fix free after use with createFromBitmapResource
Bug
9227350
Change-Id: Iee7610a9bf3d9d1baf14b968aed2a7d0876d2af7
kmccormick [Fri, 31 May 2013 20:45:53 +0000 (13:45 -0700)]
am
0dc7891c: am
7356dde4: am
a75fb065: am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
0dc7891ccb9698aa5d1f8b40aff797184c0544aa':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:38:15 +0000 (13:38 -0700)]
am
7356dde4: am
a75fb065: am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
7356dde40439e2c787d28ed05aff4ff81d8a2d39':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:36:43 +0000 (13:36 -0700)]
am
a75fb065: am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
a75fb065aff42ff7671a5b418229294f43da5cf3':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:34:09 +0000 (13:34 -0700)]
am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
c02821efde98a62fe9bbfd718847a8c3bd90eea2':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:32:52 +0000 (13:32 -0700)]
am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
eca0125267d453ab60631317a44abe869eb660fe':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:31:23 +0000 (13:31 -0700)]
am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
3886fad5d1c50dd14b11185104401887bc129c7f':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:28:57 +0000 (20:28 +0000)]
Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
kmccormick [Fri, 31 May 2013 19:28:05 +0000 (12:28 -0700)]
Doc Update: fix host title in main doc.
Change-Id: Ide683eb651ea7b485dae6c4d348b19a8d988187b
ztenghui [Fri, 31 May 2013 18:07:35 +0000 (11:07 -0700)]
am
4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev
* commit '
4f0002e6de601f6727475a3296618120b62d7f12':
MediaMuxer sample code update, no functional change
ztenghui [Fri, 31 May 2013 18:05:43 +0000 (18:05 +0000)]
Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev
Scott Main [Fri, 31 May 2013 18:03:03 +0000 (11:03 -0700)]
am
b5a9e731: am
75e12713: am
c1032cca: am
ca9948ae: revise migrating to Studio procedure
* commit '
b5a9e73154d62338852303a3a492de59360b2a17':
revise migrating to Studio procedure
Scott Main [Fri, 31 May 2013 18:00:26 +0000 (11:00 -0700)]
am
75e12713: am
c1032cca: am
ca9948ae: revise migrating to Studio procedure
* commit '
75e12713108954237991960a9e4b0482063bc09c':
revise migrating to Studio procedure
Scott Main [Fri, 31 May 2013 17:58:33 +0000 (10:58 -0700)]
am
c1032cca: am
ca9948ae: revise migrating to Studio procedure
* commit '
c1032ccae3511de06cf76a700627c41f0b71209e':
revise migrating to Studio procedure
Scott Main [Fri, 31 May 2013 17:57:24 +0000 (10:57 -0700)]
am
ca9948ae: revise migrating to Studio procedure
* commit '
ca9948ae33e4ffdc057cc8f2b1efef9c38625436':
revise migrating to Studio procedure
ztenghui [Fri, 31 May 2013 17:50:04 +0000 (10:50 -0700)]
MediaMuxer sample code update, no functional change
bug:
9213533
Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
Scott Main [Fri, 31 May 2013 17:42:35 +0000 (10:42 -0700)]
revise migrating to Studio procedure
Change-Id: Ic8d2498414ccdbe45b7ce349ecb84925e9830ee9
Joe Malin [Fri, 31 May 2013 16:11:37 +0000 (09:11 -0700)]
am
dd51bc3f: am
13c305e9: am
09bc2f2d: am
7d469061: am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
dd51bc3f5b21faebf8e6b6766f42262c1227c3f2':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:08:29 +0000 (09:08 -0700)]
am
13c305e9: am
09bc2f2d: am
7d469061: am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
13c305e944610d4b15f22908fed887f6fdbb42fa':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:06:39 +0000 (09:06 -0700)]
am
09bc2f2d: am
7d469061: am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
09bc2f2d6449259bbd4820ec33ea7837996612ed':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:04:23 +0000 (09:04 -0700)]
am
7d469061: am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
7d469061ef7cec751fda3e9d13460d2465395d45':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:03:15 +0000 (09:03 -0700)]
am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
62ba36096fa14bdc148bbfc85849a7bed44a1b82':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:02:06 +0000 (09:02 -0700)]
am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
59e24472f3fb4f3dc5d1acee40efd6b8b4d66bd7':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:00:04 +0000 (16:00 +0000)]
Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
Jean Chalard [Fri, 31 May 2013 02:47:41 +0000 (19:47 -0700)]
am
af9e5e5f: Merge "Improve the documentation for InputConnection." into jb-mr2-dev
* commit '
af9e5e5f618448f77f74bb36e0adbe88cb2ae156':
Improve the documentation for InputConnection.
Jean Chalard [Fri, 31 May 2013 02:44:07 +0000 (02:44 +0000)]
Merge "Improve the documentation for InputConnection." into jb-mr2-dev
Jim Miller [Thu, 30 May 2013 23:43:53 +0000 (16:43 -0700)]
Fix keyguard issue where an incoming SMS would switch widget
This fixes a bug where an incoming notification from AudioManager
would trigger showAppropriateWidgetPage() to be called even though
nothing has changed.
Fixes bug
9202611
Change-Id: If8bbd30b6b324233b5ad6552183c10cc5a335061
Jeff Brown [Fri, 31 May 2013 01:00:08 +0000 (18:00 -0700)]
am
636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
* commit '
636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
Jeff Brown [Fri, 31 May 2013 00:54:41 +0000 (00:54 +0000)]
Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
Joe Malin [Thu, 28 Mar 2013 18:34:05 +0000 (11:34 -0700)]
Fix #
8499531: Command line instructions
Change-Id: I4922855443f1f85e52ad4016ea3e33925c60e08e
Jeff Brown [Thu, 30 May 2013 21:13:51 +0000 (14:13 -0700)]
Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
Bug:
9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
Scott Main [Thu, 30 May 2013 21:02:05 +0000 (14:02 -0700)]
am
e302c706: am
c7dda645: am
77da4440: am
25a49f9f: fix IE 7/8 bugs on IO videos page
* commit '
e302c70643e006581c535c76c1c5d50372586ede':
fix IE 7/8 bugs on IO videos page
Scott Main [Thu, 30 May 2013 21:00:16 +0000 (14:00 -0700)]
am
c7dda645: am
77da4440: am
25a49f9f: fix IE 7/8 bugs on IO videos page
* commit '
c7dda6454fb513676575a9ce2b28112cdab6cb05':
fix IE 7/8 bugs on IO videos page
Scott Main [Thu, 30 May 2013 20:58:17 +0000 (13:58 -0700)]
am
77da4440: am
25a49f9f: fix IE 7/8 bugs on IO videos page
* commit '
77da444049f526cf702403f2543a26e208bd8c7b':
fix IE 7/8 bugs on IO videos page
Scott Main [Thu, 30 May 2013 20:56:02 +0000 (13:56 -0700)]
am
25a49f9f: fix IE 7/8 bugs on IO videos page
* commit '
25a49f9f2e33540dc413210f9dd09c6cec141896':
fix IE 7/8 bugs on IO videos page
Scott Main [Thu, 30 May 2013 20:51:08 +0000 (13:51 -0700)]
fix IE 7/8 bugs on IO videos page
Change-Id: I94d47989e8c1075c9864d0a4577434917a7913d7
Svetoslav [Thu, 30 May 2013 19:50:15 +0000 (12:50 -0700)]
am
ec586994: Merge "CalendarView header not updated on year change." into jb-mr2-dev
* commit '
ec58699413ebe4cc2a72a8aae3c420fb3d764457':
CalendarView header not updated on year change.
Svetoslav [Thu, 30 May 2013 19:48:59 +0000 (19:48 +0000)]
Merge "CalendarView header not updated on year change." into jb-mr2-dev
Daniel Sandler [Thu, 30 May 2013 19:36:59 +0000 (12:36 -0700)]
am
054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
* commit '
054255c6d282a4ab2a95e56859242a2512871296':
Unhide action to launch Daydream settings.
Daniel Sandler [Thu, 30 May 2013 19:33:06 +0000 (19:33 +0000)]
Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
kmccormick [Thu, 30 May 2013 19:03:01 +0000 (12:03 -0700)]
am
03a91724: am
fa312ff1: am
33b117c4: am
6959f7fa: am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
03a9172407103a8788e526be41a7d2c018e426ca':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 19:00:58 +0000 (12:00 -0700)]
am
fa312ff1: am
33b117c4: am
6959f7fa: am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
fa312ff108702388574021a8de22092cdde5dd6f':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:59:00 +0000 (11:59 -0700)]
am
33b117c4: am
6959f7fa: am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
33b117c493dbddbbe688aa618b99db99ae71d1de':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:56:48 +0000 (11:56 -0700)]
am
6959f7fa: am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
6959f7fad13018e14255ea98ada4221cca28bfab':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:54:02 +0000 (11:54 -0700)]
am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
4f3cadafbb1aa53cbd197239127b1d3c626cb0df':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:52:11 +0000 (11:52 -0700)]
am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
b3803855b0554879836c18b4157194b9c2061219':
Doc change: document AppWidgetHost
Matthew Xie [Thu, 30 May 2013 18:50:02 +0000 (11:50 -0700)]
am
b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev
* commit '
b190890a94dc2f0bd11da09f59550f86197f010a':
Update javadoc to give app write better guidence
OSDN Git Service
