OSDN Git Service
Joe Fernandez [Tue, 18 Dec 2012 07:49:55 +0000 (23:49 -0800)]
am
257742ef: am
0c1badc6: am
c799aee9: am
858eb008: am
34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a
* commit '
257742ef875c912f122cc8ac4af10d7dbbe0b499':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
Jamie Gennis [Tue, 18 Dec 2012 07:49:48 +0000 (23:49 -0800)]
am
ed388935: am
f8f147d1: (-s ours) am
81e3c9ed: am
d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
* commit '
ed3889356852d18624b52431606ae28e6d9b9f12':
Fade recents thumbnail to transparent earlier.
Joe Fernandez [Tue, 18 Dec 2012 07:44:39 +0000 (23:44 -0800)]
am
0c1badc6: am
c799aee9: am
858eb008: am
34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
* commit '
0c1badc64e5340b643640d37120bf926142dda1b':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
Jamie Gennis [Tue, 18 Dec 2012 07:44:35 +0000 (23:44 -0800)]
am
f8f147d1: (-s ours) am
81e3c9ed: am
d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
* commit '
f8f147d167ed2a6cf5ba4b1b3a633401ecc5d384':
Fade recents thumbnail to transparent earlier.
Joe Fernandez [Tue, 18 Dec 2012 03:01:41 +0000 (19:01 -0800)]
am
c799aee9: am
858eb008: am
34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
* commit '
c799aee9b85062a389e444c0b3009b6f0ad512a2':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
Jamie Gennis [Tue, 18 Dec 2012 03:00:00 +0000 (19:00 -0800)]
am
81e3c9ed: am
d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
* commit '
81e3c9ed66ce6968a331c4eafb969f66234d6e8a':
Fade recents thumbnail to transparent earlier.
Joe Fernandez [Tue, 18 Dec 2012 02:59:04 +0000 (18:59 -0800)]
am
858eb008: am
34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
* commit '
858eb008eb3ea720d9c38346706f4d94bd43f917':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
Jamie Gennis [Tue, 18 Dec 2012 02:57:22 +0000 (18:57 -0800)]
am
d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
* commit '
d2a21d7fee7ba3c9596baf16cadc76dd607a5cb1':
Fade recents thumbnail to transparent earlier.
Joe Fernandez [Tue, 18 Dec 2012 02:53:48 +0000 (18:53 -0800)]
am
34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
* commit '
34bdf0abfeaa81b6fe2e8cc95e0ba94893b3e8e8':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
Fabrice Di Meglio [Tue, 18 Dec 2012 02:52:42 +0000 (18:52 -0800)]
am
b4056728: Merge "Make SystemUI RTL aware"
* commit '
b405672819608613c8c2dd35bc5a958910050995':
Make SystemUI RTL aware
Jeff Sharkey [Tue, 18 Dec 2012 02:52:40 +0000 (18:52 -0800)]
am
df3b8e7e: Merge "Move stream creation outside of DrmOutputStream."
* commit '
df3b8e7e0da7cbbdec2404af85a05accfd6f8238':
Move stream creation outside of DrmOutputStream.
Jamie Gennis [Tue, 18 Dec 2012 02:30:46 +0000 (18:30 -0800)]
Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
Fabrice Di Meglio [Tue, 18 Dec 2012 01:44:38 +0000 (17:44 -0800)]
Merge "Make SystemUI RTL aware"
Craig Mautner [Tue, 18 Dec 2012 01:21:55 +0000 (17:21 -0800)]
Fade recents thumbnail to transparent earlier.
Reduce the gpu load by fading the recents thumbnail to an alpha of
0.0 before the remaining animations are completed. When alpha hits
0 the gpu treats the layer as hidden and can merge the remaining
layers in time.
This is a partial fix for
7729214.
Change-Id: I9761bbd0554db6454c7eec0485be798b11672ff5
Joe Fernandez [Tue, 18 Dec 2012 00:59:04 +0000 (16:59 -0800)]
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict
Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
Change-Id: I315da053238943a7f77cc30564904bbf0cefed62
Jeff Sharkey [Tue, 18 Dec 2012 01:07:07 +0000 (17:07 -0800)]
Merge "Move stream creation outside of DrmOutputStream."
Jeff Sharkey [Tue, 18 Dec 2012 01:03:11 +0000 (17:03 -0800)]
Move stream creation outside of DrmOutputStream.
More closely matches the object ownership pattern used by other
stream APIs. Callers must now explicitly finish(). Also fixes
write(int) bug by switching to Streams API.
Change-Id: I64f9c5887ef02496b1ce4e97ce6af5dad93b4be2
Fabrice Di Meglio [Sat, 28 Jul 2012 01:27:11 +0000 (18:27 -0700)]
Make SystemUI RTL aware
- see bug #
5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: Ica88ed68f893d5272691a9207788b65623849dee
Joe Fernandez [Mon, 17 Dec 2012 23:56:03 +0000 (15:56 -0800)]
am
f50a37d3: am
c06052e6: am
baca4e5a: am
dfb46cea: am
90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
* commit '
f50a37d30288aae5c05ef1cf266ed11772ca727e':
docs: App Template Tool documentation
Joe Fernandez [Mon, 17 Dec 2012 23:54:01 +0000 (15:54 -0800)]
am
c06052e6: am
baca4e5a: am
dfb46cea: am
90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
* commit '
c06052e6728a4e26f1745dc0939cdf4a534c8466':
docs: App Template Tool documentation
Joe Fernandez [Mon, 17 Dec 2012 23:51:48 +0000 (15:51 -0800)]
am
baca4e5a: am
dfb46cea: am
90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
* commit '
baca4e5a5d70894ab576c8b4efe6289e709ea8df':
docs: App Template Tool documentation
Joe Fernandez [Mon, 17 Dec 2012 23:49:36 +0000 (15:49 -0800)]
am
dfb46cea: am
90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
* commit '
dfb46cea6282ac9321b70af6c9a6f6b5396cde2e':
docs: App Template Tool documentation
Joe Fernandez [Mon, 17 Dec 2012 23:47:56 +0000 (15:47 -0800)]
am
90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
* commit '
90172e0f0cb0abfbaa3f1ea0e5251913bd30d828':
docs: App Template Tool documentation
Joe Fernandez [Mon, 17 Dec 2012 23:45:01 +0000 (15:45 -0800)]
Merge "docs: App Template Tool documentation" into jb-mr1-dev
Robert Ly [Mon, 17 Dec 2012 23:43:45 +0000 (15:43 -0800)]
am
d0f35aa9: am
bfb69176: am
d4f4d14a: am
5042b051: am
e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
* commit '
d0f35aa9c9e5652d0e6b54f059ba039a76a9aed2':
change onEnd() to withEndAction() in javadocs
Robert Ly [Mon, 17 Dec 2012 23:41:25 +0000 (15:41 -0800)]
am
bfb69176: am
d4f4d14a: am
5042b051: am
e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
* commit '
bfb69176db2017a10072e4ba4e96d4a33f18e4a8':
change onEnd() to withEndAction() in javadocs
Robert Ly [Mon, 17 Dec 2012 23:39:34 +0000 (15:39 -0800)]
am
d4f4d14a: am
5042b051: am
e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
* commit '
d4f4d14a91492384c4553b82be27b5f135a41227':
change onEnd() to withEndAction() in javadocs
Robert Ly [Mon, 17 Dec 2012 23:37:21 +0000 (15:37 -0800)]
am
5042b051: am
e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
* commit '
5042b051b395f36d3c582202e9e78758934b79a6':
change onEnd() to withEndAction() in javadocs
Robert Ly [Mon, 17 Dec 2012 23:35:26 +0000 (15:35 -0800)]
am
e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
* commit '
e7c3fba7929a1cb73bbe6ca84a5140febc09a62a':
change onEnd() to withEndAction() in javadocs
Robert Ly [Mon, 17 Dec 2012 23:32:40 +0000 (15:32 -0800)]
Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
Robert Ly [Mon, 17 Dec 2012 23:00:08 +0000 (15:00 -0800)]
change onEnd() to withEndAction() in javadocs
Change-Id: Ic9a04bf86d62249b47dc654052d58797dfc3990c
Laurent Tu [Mon, 17 Dec 2012 22:55:47 +0000 (14:55 -0800)]
am
31cb7ad3: Merge "Revert "Move location provider lib to frameworks/ex - 1""
* commit '
31cb7ad34dcb801535514d9d11250867e6e79c04':
Revert "Move location provider lib to frameworks/ex - 1"
Laurent Tu [Mon, 17 Dec 2012 22:52:47 +0000 (14:52 -0800)]
Merge "Revert "Move location provider lib to frameworks/ex - 1""
Joe Fernandez [Sat, 17 Nov 2012 00:10:52 +0000 (16:10 -0800)]
docs: App Template Tool documentation
Change-Id: I75b8956b808ab21cb744f67c2ce69405dc0a0de4
Tim Murray [Mon, 17 Dec 2012 21:25:18 +0000 (13:25 -0800)]
am
eef62390: Merge "Add struct for controlling clipping in Java."
* commit '
eef623900c44f2629aae87db188363623ef46592':
Add struct for controlling clipping in Java.
Tim Murray [Mon, 17 Dec 2012 21:21:31 +0000 (13:21 -0800)]
Merge "Add struct for controlling clipping in Java."
Glenn Kasten [Mon, 17 Dec 2012 20:15:13 +0000 (12:15 -0800)]
am
d35d3687: Merge "Turn off execute bit for ordinary media files"
* commit '
d35d3687c741bb8d7cb025c7369755354ca0e53d':
Turn off execute bit for ordinary media files
Glenn Kasten [Mon, 17 Dec 2012 20:12:40 +0000 (12:12 -0800)]
Merge "Turn off execute bit for ordinary media files"
Tim Murray [Sat, 15 Dec 2012 00:01:58 +0000 (16:01 -0800)]
Add struct for controlling clipping in Java.
Change-Id: Iac747e492c680530553909b0389b230fbc654e30
Scott Main [Mon, 17 Dec 2012 19:54:06 +0000 (11:54 -0800)]
am
1c07ab35: am
771e5a67: am
01ec5987: am
da013c48: am
f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
* commit '
1c07ab358801997306bb467e1ab1af4d5c3ad815':
docs: remove developer survery link
Scott Main [Mon, 17 Dec 2012 19:52:08 +0000 (11:52 -0800)]
am
771e5a67: am
01ec5987: am
da013c48: am
f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
* commit '
771e5a67093884ff47900bc09db4fe165f0ec524':
docs: remove developer survery link
Scott Main [Mon, 17 Dec 2012 19:49:00 +0000 (11:49 -0800)]
am
01ec5987: am
da013c48: am
f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
* commit '
01ec5987d11be67f009a9d2eb3aabee95125090a':
docs: remove developer survery link
Scott Main [Mon, 17 Dec 2012 19:47:10 +0000 (11:47 -0800)]
am
da013c48: am
f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
* commit '
da013c48d74aae3c5723eb569ebb324a94db27f2':
docs: remove developer survery link
Scott Main [Mon, 17 Dec 2012 19:44:49 +0000 (11:44 -0800)]
am
f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
* commit '
f347e841178358b248b5b1abed059079d2ca1ebe':
docs: remove developer survery link
Scott Main [Mon, 17 Dec 2012 19:41:55 +0000 (11:41 -0800)]
Merge "docs: remove developer survery link" into jb-mr1-dev
Christopher Tate [Mon, 17 Dec 2012 19:06:22 +0000 (11:06 -0800)]
am
17697f23: am
eea47240: am
4b0ed017: Merge "BackupHelpers: Fix Typo"
* commit '
17697f234fafac8fb1bf1abdd3792fd4d4fee89c':
BackupHelpers: Fix Typo
Christopher Tate [Mon, 17 Dec 2012 19:03:45 +0000 (11:03 -0800)]
am
eea47240: am
4b0ed017: Merge "BackupHelpers: Fix Typo"
* commit '
eea47240b085fa0260011423774506b5375b9351':
BackupHelpers: Fix Typo
Christopher Tate [Mon, 17 Dec 2012 19:02:04 +0000 (11:02 -0800)]
am
4b0ed017: Merge "BackupHelpers: Fix Typo"
* commit '
4b0ed0178de2c9c21bd5514671b8b4282f6a03db':
BackupHelpers: Fix Typo
Scott Main [Mon, 17 Dec 2012 18:52:40 +0000 (10:52 -0800)]
docs: remove developer survery link
Change-Id: I8f87e53df4f920ace7f8258c6cf0686ad4d8fead
Sascha Prueter [Mon, 17 Dec 2012 18:51:54 +0000 (10:51 -0800)]
am
ab989ac3: am
8149820c: am
25458528: am
dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
* commit '
ab989ac313a996280aec61183636e3fb9ac21d9d':
Handle "CODE_ALREADY_PRESENT" message from Settings app
Sascha Prueter [Mon, 17 Dec 2012 18:49:38 +0000 (10:49 -0800)]
am
8149820c: am
25458528: am
dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
* commit '
8149820c2b2df47028498571785ca009d99b5dc9':
Handle "CODE_ALREADY_PRESENT" message from Settings app
Sascha Prueter [Mon, 17 Dec 2012 18:47:56 +0000 (10:47 -0800)]
am
25458528: am
dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
* commit '
25458528f07ef9f4710e669b74b76d687bbc7645':
Handle "CODE_ALREADY_PRESENT" message from Settings app
Sascha Prueter [Mon, 17 Dec 2012 18:46:04 +0000 (10:46 -0800)]
am
dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
* commit '
dd2ed93e4794dd8472593cdd21fb7e0056f11dbf':
Handle "CODE_ALREADY_PRESENT" message from Settings app
Sascha Prueter [Mon, 17 Dec 2012 18:42:55 +0000 (10:42 -0800)]
Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
Christopher Tate [Mon, 17 Dec 2012 18:39:41 +0000 (10:39 -0800)]
Merge "BackupHelpers: Fix Typo"
Robert Ly [Mon, 17 Dec 2012 18:36:30 +0000 (10:36 -0800)]
am
c1b8f785: am
1d349dd4: am
5d2de143: am
4664782f: am
f93a2941: Merge "docs: update gms auth docs for bug
7737187" into jb-mr1-dev
* commit '
c1b8f785384c26744effe9063d5cdb8ff970b417':
docs: update gms auth docs for bug
7737187
Robert Ly [Mon, 17 Dec 2012 18:34:19 +0000 (10:34 -0800)]
am
1d349dd4: am
5d2de143: am
4664782f: am
f93a2941: Merge "docs: update gms auth docs for bug
7737187" into jb-mr1-dev
* commit '
1d349dd4ee6e65e005498806f28e721d6961b03a':
docs: update gms auth docs for bug
7737187
Robert Ly [Mon, 17 Dec 2012 18:31:45 +0000 (10:31 -0800)]
am
5d2de143: am
4664782f: am
f93a2941: Merge "docs: update gms auth docs for bug
7737187" into jb-mr1-dev
* commit '
5d2de143883381fb65b026b0975730970e6f33c7':
docs: update gms auth docs for bug
7737187
Robert Ly [Mon, 17 Dec 2012 18:30:00 +0000 (10:30 -0800)]
am
4664782f: am
f93a2941: Merge "docs: update gms auth docs for bug
7737187" into jb-mr1-dev
* commit '
4664782f88ef1dad1b16a18d51947132d650afeb':
docs: update gms auth docs for bug
7737187
Robert Ly [Mon, 17 Dec 2012 18:28:01 +0000 (10:28 -0800)]
am
f93a2941: Merge "docs: update gms auth docs for bug
7737187" into jb-mr1-dev
* commit '
f93a2941ad8ec72f288669da2426605ad85a98ca':
docs: update gms auth docs for bug
7737187
Robert Ly [Mon, 17 Dec 2012 18:24:38 +0000 (10:24 -0800)]
Merge "docs: update gms auth docs for bug
7737187" into jb-mr1-dev
Craig Mautner [Mon, 17 Dec 2012 17:52:35 +0000 (09:52 -0800)]
am
1c967a16: am
1e944479: am
367921dd: (-s ours) Merge "Toast: fix force close if called from system service"
* commit '
1c967a167123448622237d99f0cdf38c523d0ff8':
Toast: fix force close if called from system service
Craig Mautner [Mon, 17 Dec 2012 17:50:28 +0000 (09:50 -0800)]
am
1e944479: am
367921dd: (-s ours) Merge "Toast: fix force close if called from system service"
* commit '
1e9444797d17add3fc4960239a5ed0bc61ce972d':
Toast: fix force close if called from system service
Craig Mautner [Mon, 17 Dec 2012 17:40:02 +0000 (09:40 -0800)]
am
367921dd: (-s ours) Merge "Toast: fix force close if called from system service"
* commit '
367921dd879cbc041852b121ce35b3c12803d853':
Toast: fix force close if called from system service
Craig Mautner [Mon, 17 Dec 2012 17:05:07 +0000 (09:05 -0800)]
Merge "Toast: fix force close if called from system service"
Mikhail Naganov [Mon, 17 Dec 2012 13:25:06 +0000 (05:25 -0800)]
am
ba34779c: Merge "Add new LayoutAlgorithm -- TEXT_AUTOSIZING"
* commit '
ba34779c3b0809483521f199e0eba75e77814088':
Add new LayoutAlgorithm -- TEXT_AUTOSIZING
Mikhail Naganov [Mon, 17 Dec 2012 13:21:59 +0000 (05:21 -0800)]
Merge "Add new LayoutAlgorithm -- TEXT_AUTOSIZING"
Mikhail Naganov [Fri, 14 Dec 2012 17:01:25 +0000 (17:01 +0000)]
Add new LayoutAlgorithm -- TEXT_AUTOSIZING
The algorithm will only be implemented in the new version of WebView.
BUG=
6294649
Change-Id: I302b0b572236e57c0ce07946361e9e743321b6a8
Pawit Pornkitprasan [Mon, 17 Dec 2012 10:57:51 +0000 (17:57 +0700)]
Toast: fix force close if called from system service
If a toast is created from a system service, an application context
will not be available, use the service context instead.
Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075
Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
satok [Mon, 17 Dec 2012 05:57:54 +0000 (14:57 +0900)]
Handle "CODE_ALREADY_PRESENT" message from Settings app
Bug:
7725834
Change-Id: I85c35e73978d606edf9687e2de76c6ffc3c3ee2b
You Kim [Sun, 16 Dec 2012 18:36:10 +0000 (03:36 +0900)]
BackupHelpers: Fix Typo
delete --> free
Change-Id: Idbf7e677f8cc4a9a9d04e58b5cf7d0f1589c5211
Elliott Hughes [Sat, 15 Dec 2012 23:15:35 +0000 (15:15 -0800)]
am
a43e9b7c: am
6647f1bd: am
c749261f: Merge "Fix DateUtils.formatElapsedTime."
* commit '
a43e9b7c0ebe1c3a2a77dec73b275b2ce7ad13e4':
Fix DateUtils.formatElapsedTime.
Marco Nelissen [Sat, 15 Dec 2012 23:15:33 +0000 (15:15 -0800)]
am
f4c50a87: am
50c78219: am
01f42639: Merge "fix typo in docs"
* commit '
f4c50a87cf6c7fc15c383e43c95ccd53e9b8259f':
fix typo in docs
Elliott Hughes [Sat, 15 Dec 2012 23:15:26 +0000 (15:15 -0800)]
am
53e621f2: am
898d8048: am
2eca1b53: Merge "Add return after NULL check in JetPlayer"
* commit '
53e621f2f326b9d782b17434316c3eb2593e1fe9':
Add return after NULL check in JetPlayer
Amith Yamasani [Sat, 15 Dec 2012 23:15:23 +0000 (15:15 -0800)]
am
5d8961e7: am
507ea24b: am
ffdc7aed: Merge "avoid crashing system serer process"
* commit '
5d8961e75685674f46ca376ea8ea13ce02dd292b':
avoid crashing system serer process
Elliott Hughes [Sat, 15 Dec 2012 23:10:42 +0000 (15:10 -0800)]
am
6647f1bd: am
c749261f: Merge "Fix DateUtils.formatElapsedTime."
* commit '
6647f1bd2b3a615cf02111aab21eecdd76ce7c09':
Fix DateUtils.formatElapsedTime.
Marco Nelissen [Sat, 15 Dec 2012 23:10:38 +0000 (15:10 -0800)]
am
50c78219: am
01f42639: Merge "fix typo in docs"
* commit '
50c782190d282b76b7d961cf7f9a9e3f0db735ad':
fix typo in docs
Elliott Hughes [Sat, 15 Dec 2012 23:10:34 +0000 (15:10 -0800)]
am
898d8048: am
2eca1b53: Merge "Add return after NULL check in JetPlayer"
* commit '
898d8048b69124e919935903da97757ad2ebea4c':
Add return after NULL check in JetPlayer
Amith Yamasani [Sat, 15 Dec 2012 23:10:30 +0000 (15:10 -0800)]
am
507ea24b: am
ffdc7aed: Merge "avoid crashing system serer process"
* commit '
507ea24b8f881f8af42393a0512c88cf7397edb9':
avoid crashing system serer process
Elliott Hughes [Sat, 15 Dec 2012 22:58:01 +0000 (14:58 -0800)]
am
c749261f: Merge "Fix DateUtils.formatElapsedTime."
* commit '
c749261fea1010dfa2d1337bd210c81d13052540':
Fix DateUtils.formatElapsedTime.
Marco Nelissen [Sat, 15 Dec 2012 22:57:51 +0000 (14:57 -0800)]
am
01f42639: Merge "fix typo in docs"
* commit '
01f42639f21ec98feb5e5d458632a1a1005b17e8':
fix typo in docs
Elliott Hughes [Sat, 15 Dec 2012 22:57:46 +0000 (14:57 -0800)]
am
2eca1b53: Merge "Add return after NULL check in JetPlayer"
* commit '
2eca1b53ae905f5ddaebaff7156340efdf97cb84':
Add return after NULL check in JetPlayer
Amith Yamasani [Sat, 15 Dec 2012 22:57:40 +0000 (14:57 -0800)]
am
ffdc7aed: Merge "avoid crashing system serer process"
* commit '
ffdc7aed5ec8f38706ddfad02d3df05493351083':
avoid crashing system serer process
Svetoslav Ganov [Sat, 15 Dec 2012 01:49:19 +0000 (17:49 -0800)]
am
7a3d56e1: Merge "Fixing the build"
* commit '
7a3d56e1214bb36dee7ef85678c893d01587216f':
Fixing the build
Svetoslav Ganov [Sat, 15 Dec 2012 01:46:34 +0000 (17:46 -0800)]
Merge "Fixing the build"
Svetoslav Ganov [Sat, 15 Dec 2012 01:45:44 +0000 (17:45 -0800)]
Fixing the build
Change-Id: I01349d65ac5915da090cfb018f99e0a508f9d5ad
Elliott Hughes [Sat, 15 Dec 2012 01:39:19 +0000 (17:39 -0800)]
Merge "Fix DateUtils.formatElapsedTime."
Svetoslav Ganov [Sat, 15 Dec 2012 01:27:57 +0000 (17:27 -0800)]
am
2fd569a0: Merge "Simplification of the Pools implementation."
* commit '
2fd569a086f77f3a906f0280ecfe4cafbcb9fdc8':
Simplification of the Pools implementation.
Svetoslav Ganov [Sat, 15 Dec 2012 01:25:33 +0000 (17:25 -0800)]
Merge "Simplification of the Pools implementation."
Svetoslav Ganov [Sat, 15 Dec 2012 01:15:51 +0000 (17:15 -0800)]
am
0bf39c80: Merge "Refactoring of the screen magnification feature."
* commit '
0bf39c8073f662b02bf5421729522a43692c0c54':
Refactoring of the screen magnification feature.
Nick Kralevich [Sat, 15 Dec 2012 01:14:25 +0000 (17:14 -0800)]
am
0bba28cc: Merge "App home directories are now 0700 for targetSdkVersion > 17"
* commit '
0bba28cce762175f9a618627345dc0d9150e6266':
App home directories are now 0700 for targetSdkVersion > 17
Svetoslav Ganov [Sat, 15 Dec 2012 01:12:12 +0000 (17:12 -0800)]
Merge "Refactoring of the screen magnification feature."
Nick Kralevich [Sat, 15 Dec 2012 01:10:59 +0000 (17:10 -0800)]
Merge "App home directories are now 0700 for targetSdkVersion > 17"
The Android Open Source Project [Sat, 15 Dec 2012 00:51:43 +0000 (16:51 -0800)]
am
ed6b57fc: (-s ours) am
17a89072: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
ed6b57fcff8e3204bbd1a2333c13ee560dd287ee':
Baligh Uddin [Sat, 15 Dec 2012 00:51:41 +0000 (16:51 -0800)]
am
3a1dea0b: (-s ours) am
3ffa3798: (-s ours) am
8a3eb664: am
435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
3a1dea0b95be22743aa3b8a9abe3e7d9dcda2b23':
Import translations. DO NOT MERGE
Scott Main [Sat, 15 Dec 2012 00:51:38 +0000 (16:51 -0800)]
am
4725b58e: am
15434e7c: am
a828b8ff: am
3b16e13c: am
3a494adf: Merge "docs: add cursorloader class to side nav" into jb-mr1-dev
* commit '
4725b58e54f1d9898949755980f6427045442529':
docs: add cursorloader class to side nav
Baligh Uddin [Sat, 15 Dec 2012 00:51:35 +0000 (16:51 -0800)]
am
65fe0081: (-s ours) am
4e7ec514: (-s ours) am
0ec825ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
65fe00812e220419d053adc8d910b2f19eed9c3a':
Import translations. DO NOT MERGE
Quddus Chong [Sat, 15 Dec 2012 00:51:33 +0000 (16:51 -0800)]
am
6d430fd9: am
13bc2d26: am
cac633c7: am
dc167dc6: am
9b7cb6f0: docs: Fixing broken IABv3 internal links
* commit '
6d430fd9efd266ae7e169bff93a8d5b40c821693':
docs: Fixing broken IABv3 internal links
The Android Open Source Project [Sat, 15 Dec 2012 00:48:50 +0000 (16:48 -0800)]
am
17a89072: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
17a890729e430503c7a906073dbde570da34c377':
Baligh Uddin [Sat, 15 Dec 2012 00:48:33 +0000 (16:48 -0800)]
am
3ffa3798: (-s ours) am
8a3eb664: am
435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
3ffa3798786fc77a3b3fa905cd978688b827fead':
Import translations. DO NOT MERGE
OSDN Git Service
