OSDN Git Service
John Reck [Tue, 25 Jun 2013 22:31:39 +0000 (15:31 -0700)]
am
12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"
* commit '
12c4c0e45b12be18005f0ad2af2433e34dcb1a9f':
Fix deadlock of WebViewCoreThread
John Reck [Tue, 25 Jun 2013 22:28:02 +0000 (22:28 +0000)]
Merge "Fix deadlock of WebViewCoreThread"
Christopher Tate [Mon, 24 Jun 2013 23:05:49 +0000 (16:05 -0700)]
am
3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
* commit '
3e7d0344399ac2f607fddde32c1a5e54228a38f9':
Avoid adding FORWARD_LOCK flag to an updated system app
Christopher Tate [Mon, 24 Jun 2013 23:02:00 +0000 (23:02 +0000)]
Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
Jean-Baptiste Queru [Mon, 24 Jun 2013 21:27:28 +0000 (14:27 -0700)]
am
4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout"
* commit '
4be48d436bb2d8d2207b317f9a826c27671b6d4b':
Lockscreen : Reference correct layout
Jean-Baptiste Queru [Mon, 24 Jun 2013 21:15:45 +0000 (21:15 +0000)]
Merge "Lockscreen : Reference correct layout"
Danesh Mondegarian [Mon, 24 Jun 2013 20:00:35 +0000 (16:00 -0400)]
Lockscreen : Reference correct layout
Include correct layout for portrait.
Change-Id: I6de511357aec0f4364cd68c3ed740c7d4f47379d
Wink Saville [Fri, 21 Jun 2013 19:12:24 +0000 (12:12 -0700)]
am
34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
* commit '
34fb4eae36bc926886149718672809a1ad43be97':
Fix misspelling of getLteSignalStrenght.
Wink Saville [Fri, 21 Jun 2013 19:06:54 +0000 (19:06 +0000)]
Merge "Fix misspelling of getLteSignalStrenght."
Wink Saville [Fri, 21 Jun 2013 16:58:11 +0000 (09:58 -0700)]
Fix misspelling of getLteSignalStrenght.
Change to getLteSignalStrength.
Change-Id: Ie2acec9e01af0e64a61902383f06729a7cee1975
Dianne Hackborn [Tue, 18 Jun 2013 01:21:41 +0000 (18:21 -0700)]
am
11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '
11cd57caee4058dab743b91e715d7469c59a5c2f':
Avoid unnecessary FindClass("java/lang/String").
Dianne Hackborn [Tue, 18 Jun 2013 01:14:37 +0000 (01:14 +0000)]
Merge "Avoid unnecessary FindClass("java/lang/String")."
Elliott Hughes [Mon, 17 Jun 2013 20:38:59 +0000 (13:38 -0700)]
am
f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
* commit '
f6a671394ca3d269835d5f5b882b46f9539e9a96':
Correct Date format for el_GR, sv_SE and tr_TR locales
Elliott Hughes [Mon, 17 Jun 2013 20:36:53 +0000 (20:36 +0000)]
Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
howardb [Sun, 16 Jun 2013 13:16:53 +0000 (14:16 +0100)]
Correct Date format for el_GR, sv_SE and tr_TR locales
Amend DateFormat.getDateFormat to CLDR data from icu4c
instead of locale specific resource entries which are incorrect
for several locales.
No CTS tests are added as they require changing the locale which
is not currently possible.
Bug: https://code.google.com/p/android/issues/detail?id=56385
Change-Id: Ibd11c7fd9b595e19a3e2bf508e1585aa50067e03
Signed-off-by: howardb <android@howardb.com>
Vladimir Marko [Mon, 17 Jun 2013 11:46:22 +0000 (12:46 +0100)]
Avoid unnecessary FindClass("java/lang/String").
Use previously retrieved global reference instead.
Check for NULL after creating the global reference.
Change-Id: I21670d2ef0f63ddb5801dd21e7e56359e5519479
Elliott Hughes [Fri, 14 Jun 2013 23:22:12 +0000 (16:22 -0700)]
am
618ed234: Merge "Track nio API change."
* commit '
618ed2340283263164f578f818cc09148aacb9ed':
Track nio API change.
Elliott Hughes [Fri, 14 Jun 2013 23:18:35 +0000 (23:18 +0000)]
Merge "Track nio API change."
Elliott Hughes [Fri, 14 Jun 2013 22:41:26 +0000 (15:41 -0700)]
Track nio API change.
Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
Narayan Kamath [Thu, 13 Jun 2013 09:29:11 +0000 (02:29 -0700)]
am
6706ca96: Merge "Update HttpResponseCache to use the new cache API."
* commit '
6706ca96b21ebbd620fb597a23e8180f76bb37cf':
Update HttpResponseCache to use the new cache API.
Narayan Kamath [Thu, 13 Jun 2013 09:26:33 +0000 (09:26 +0000)]
Merge "Update HttpResponseCache to use the new cache API."
Narayan Kamath [Thu, 6 Jun 2013 11:16:40 +0000 (12:16 +0100)]
Update HttpResponseCache to use the new cache API.
The new API was introduced in
https://android-review.googlesource.com/#/c/59985/
Change-Id: Ie64de7fc64b818bebf1077dff407813865769387
Adam Powell [Fri, 7 Jun 2013 18:49:32 +0000 (11:49 -0700)]
am
8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
* commit '
8152c7940a10f11a9edb16ae1daeca8a6fe2e6bb':
Fix incorrect fragment animation used for hiding fragments
Adam Powell [Fri, 7 Jun 2013 18:46:18 +0000 (18:46 +0000)]
Merge "Fix incorrect fragment animation used for hiding fragments"
Adam Powell [Fri, 7 Jun 2013 17:16:08 +0000 (10:16 -0700)]
Fix incorrect fragment animation used for hiding fragments
Mirror of support lib patch
https://android-review.googlesource.com/#/c/60032/ into
frameworks/base.
Change-Id: I8d1cb2e217721336674b8e3e2ef8722a8d9baefd
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
OSDN Git Service
