OSDN Git Service
Brian Carlstrom [Mon, 3 Feb 2014 18:11:48 +0000 (10:11 -0800)]
Merge commit '
2cd0563c' into mm
Narayan Kamath [Fri, 31 Jan 2014 23:12:34 +0000 (15:12 -0800)]
am
70986e19: (-s ours) am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
70986e197bbaf4de4f8126519a75df2b057c3b52':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Fri, 31 Jan 2014 22:05:33 +0000 (14:05 -0800)]
am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
fa2e16e36d95d5cf0848a28a98ac4566321fc119':
change Surface constructor arg to 64bit
Evan Charlton [Fri, 31 Jan 2014 21:58:46 +0000 (13:58 -0800)]
resolved conflicts for merge of
cb7cdd50 to master-nova
Change-Id: Idf4f4b41ddfd15a0e6e45cf3a45f57fa39e82708
Nick Kralevich [Fri, 31 Jan 2014 16:46:03 +0000 (08:46 -0800)]
am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
3dfa15c49b4c78cdf3bf1af79e9b307596455708':
Map SELinux log levels to Android log levels.
Scott Main [Fri, 31 Jan 2014 08:18:05 +0000 (00:18 -0800)]
am
ca821336: am
53959634: am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
ca821336bdec3f1931f399e2a38e4171f92069a3':
Scott Main [Fri, 31 Jan 2014 08:18:02 +0000 (00:18 -0800)]
am
8d1a52c8: am
a749593d: am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
8d1a52c832c392ad28d7a5400e436cdf6223d8f7':
Quddus Chong [Fri, 31 Jan 2014 08:17:57 +0000 (00:17 -0800)]
am
5e5d04b4: am
7ce575a5: am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
5e5d04b468719490ae3ef68573b9c204e0f2d6e5':
Hui Lu [Fri, 31 Jan 2014 08:17:53 +0000 (00:17 -0800)]
am
945d69d7: am
3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev
* commit '
945d69d7b843ed319ec98986b033ea7b86383e69':
Add proxy as another network.
Scott Main [Fri, 31 Jan 2014 08:12:30 +0000 (08:12 +0000)]
am
53959634: am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
53959634b35ab75ef40ac4514d50bae2de9425ac':
Revert "add Cast to the sidenav"
Scott Main [Fri, 31 Jan 2014 08:12:25 +0000 (08:12 +0000)]
am
a749593d: am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
a749593dd64f6d8f8d5d5e6addd16699258e9130':
Revert "add google cast feature page"
Quddus Chong [Fri, 31 Jan 2014 08:12:20 +0000 (08:12 +0000)]
am
7ce575a5: am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
7ce575a5257328ce089d6eaa39eb493eafbd473c':
Revert "docs: Added API reference docs for GCore Iberico release."
Hui Lu [Fri, 31 Jan 2014 08:11:57 +0000 (08:11 +0000)]
am
3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev
* commit '
3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
Add proxy as another network.
George Mount [Fri, 31 Jan 2014 04:37:49 +0000 (20:37 -0800)]
am
d0856259: Merge "Add PathInterpolator to interpolate along a Path."
* commit '
d0856259762eddd873a068c2e9cd3d4e45009a68':
Add PathInterpolator to interpolate along a Path.
Scott Main [Fri, 31 Jan 2014 02:53:23 +0000 (18:53 -0800)]
am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
40a7e3c425120661c305999f7c2bdd76d3240b7d':
Revert "add Cast to the sidenav"
Scott Main [Fri, 31 Jan 2014 02:53:20 +0000 (18:53 -0800)]
am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
04022e50774c02ff0a7757c5464486af021fd108':
Revert "add google cast feature page"
Quddus Chong [Fri, 31 Jan 2014 02:53:11 +0000 (18:53 -0800)]
am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
bcf8faa6c79bde5b9580057238e447165ac9d329':
Revert "docs: Added API reference docs for GCore Iberico release."
George Mount [Fri, 31 Jan 2014 00:53:19 +0000 (00:53 +0000)]
Merge "Add PathInterpolator to interpolate along a Path."
George Mount [Thu, 10 Oct 2013 22:28:17 +0000 (15:28 -0700)]
Add PathInterpolator to interpolate along a Path.
Change-Id: I45b361ef8edd49b5e22d66ba9e25600065e0d5e7
Brian Carlstrom [Fri, 31 Jan 2014 00:23:32 +0000 (16:23 -0800)]
am
a76be8ba: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
a76be8ba7ac14092669c981e76f07f97d2c3f386':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 31 Jan 2014 00:21:15 +0000 (00:21 +0000)]
Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
(cherry picked from commit
c6c633608ad4cd77ed21227b0bdb11eb79797c31)
Bug:
12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
John Reck [Thu, 30 Jan 2014 23:31:47 +0000 (15:31 -0800)]
am
3040f735: Merge "Fix nano vs. millis"
* commit '
3040f7354106dbc2a43b0ca21de25811f0d4057d':
Fix nano vs. millis
Scott Main [Thu, 30 Jan 2014 23:25:08 +0000 (23:25 +0000)]
am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
40a7e3c425120661c305999f7c2bdd76d3240b7d':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 23:25:02 +0000 (23:25 +0000)]
am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
04022e50774c02ff0a7757c5464486af021fd108':
Revert "add google cast feature page"
Quddus Chong [Thu, 30 Jan 2014 23:24:54 +0000 (23:24 +0000)]
am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
bcf8faa6c79bde5b9580057238e447165ac9d329':
Revert "docs: Added API reference docs for GCore Iberico release."
John Reck [Thu, 30 Jan 2014 23:16:09 +0000 (23:16 +0000)]
Merge "Fix nano vs. millis"
Hui Lu [Thu, 30 Jan 2014 22:58:48 +0000 (22:58 +0000)]
Merge "Add proxy as another network." into klp-modular-dev
Hui Lu [Wed, 15 Jan 2014 16:05:36 +0000 (11:05 -0500)]
Add proxy as another network.
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
Fabrice Di Meglio [Thu, 30 Jan 2014 22:18:40 +0000 (14:18 -0800)]
am
d95dc28f: Merge "Make public but hide OnPreferenceTreeClickListener"
* commit '
d95dc28f8ecddc0201144a2aa3f1ebbc018e5892':
Make public but hide OnPreferenceTreeClickListener
Fabrice Di Meglio [Thu, 30 Jan 2014 22:18:36 +0000 (14:18 -0800)]
am
25da1bac: Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)"
* commit '
25da1bac824033be3807d79eb22e83a32a57cfd8':
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)
Fabrice Di Meglio [Thu, 30 Jan 2014 22:17:16 +0000 (22:17 +0000)]
Merge "Make public but hide OnPreferenceTreeClickListener"
Fabrice Di Meglio [Thu, 30 Jan 2014 22:15:07 +0000 (22:15 +0000)]
Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)"
Brian Carlstrom [Thu, 30 Jan 2014 22:11:02 +0000 (14:11 -0800)]
am
3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
3038046b23540ccf4ca80f181386a77cf64d5e27':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Scott Main [Thu, 30 Jan 2014 22:10:50 +0000 (22:10 +0000)]
am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
e71cc6fd82df1bf654d72e796ac7975dbf0aff29':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 22:10:45 +0000 (22:10 +0000)]
am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
4b1a317abb56dc90efacf86ccd796643b1f02478':
Revert "add google cast feature page"
Patrick Tjin [Thu, 30 Jan 2014 21:52:28 +0000 (13:52 -0800)]
am
ca7d380f: Merge "Formatting fix"
* commit '
ca7d380fb82bfbcb66782b0c7b6150db35e133f2':
Formatting fix
Andy McFadden [Thu, 30 Jan 2014 21:52:25 +0000 (13:52 -0800)]
am
acdbb9a9: Merge "Allow "opaque" flag to be updated"
* commit '
acdbb9a9e1443b6690864446d76e4067f2bd7640':
Allow "opaque" flag to be updated
Scott Main [Thu, 30 Jan 2014 21:52:15 +0000 (21:52 +0000)]
am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
897739f1b7d179cd402fcf907e2ac9751fe44c6d':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 21:52:11 +0000 (21:52 +0000)]
am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
428ccea5090d3a88d6af898cd90b52df4062101f':
Revert "add google cast feature page"
Brian Carlstrom [Thu, 30 Jan 2014 21:50:57 +0000 (21:50 +0000)]
Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
Patrick Tjin [Thu, 30 Jan 2014 21:46:52 +0000 (21:46 +0000)]
Merge "Formatting fix"
Andy McFadden [Thu, 30 Jan 2014 21:41:38 +0000 (21:41 +0000)]
Merge "Allow "opaque" flag to be updated"
Patrick Tjin [Thu, 30 Jan 2014 21:28:46 +0000 (13:28 -0800)]
Formatting fix
Remove whitespace from end of Sync Status table
Change-Id: I5b0bf3380e0c67c769ec9c334f1374713c94aa94
Scott Main [Thu, 30 Jan 2014 21:27:25 +0000 (21:27 +0000)]
Merge "Revert "add Cast to the sidenav"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:27:06 +0000 (21:27 +0000)]
Revert "add Cast to the sidenav"
This reverts commit
3781318fefba28699e7713b231c9591bf29eadac.
Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d
Scott Main [Thu, 30 Jan 2014 21:24:45 +0000 (21:24 +0000)]
Merge "Revert "add google cast feature page"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:24:25 +0000 (21:24 +0000)]
Revert "add google cast feature page"
This reverts commit
cf010ab9c5df8896c57a722137ac3b4306ef1ca5.
Change-Id: I87197ce3c4f65ae8899bbf081cb4c0e84e4f1684
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
Quddus Chong [Thu, 30 Jan 2014 19:36:07 +0000 (19:36 +0000)]
am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
f29e2589a440e73d9dea1a6c9c7aed1c5a3002f2':
Revert "docs: Added API reference docs for GCore Iberico release."
Quddus Chong [Thu, 30 Jan 2014 19:33:24 +0000 (19:33 +0000)]
am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
583e0b2c0e1011406342a0801045a893b75880ca':
Revert "docs: Added API reference docs for GCore Iberico release."
Quddus Chong [Thu, 30 Jan 2014 19:31:05 +0000 (19:31 +0000)]
Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
Quddus Chong [Thu, 30 Jan 2014 19:03:16 +0000 (19:03 +0000)]
Revert "docs: Added API reference docs for GCore Iberico release."
This reverts commit
32993c68fff5cb229c8503ffe0fad06b53189377.
Change-Id: I8eab48ae260a3289ae0d4c0a131d80a1fd1a5316
Dan Sandler [Thu, 30 Jan 2014 18:36:17 +0000 (10:36 -0800)]
am
87b9ef52: Merge "Redact public version of screenshot notifications."
* commit '
87b9ef5228ba6459e5feb661915c597f23688802':
Redact public version of screenshot notifications.
Dan Sandler [Thu, 30 Jan 2014 18:36:14 +0000 (10:36 -0800)]
am
1b7be346: Merge "SystemUI support for notification visibility."
* commit '
1b7be3465d0be95e17c8ac9c759a45abaab50017':
SystemUI support for notification visibility.
Dan Sandler [Thu, 30 Jan 2014 18:36:10 +0000 (10:36 -0800)]
am
f5683401: Merge "Notification visibility APIs."
* commit '
f56834018d124b8ad30b77bcc043645c31ffb7b1':
Notification visibility APIs.
Dan Sandler [Thu, 30 Jan 2014 18:33:58 +0000 (18:33 +0000)]
Merge "Redact public version of screenshot notifications."
Dan Sandler [Thu, 30 Jan 2014 18:33:47 +0000 (18:33 +0000)]
Merge "SystemUI support for notification visibility."
Dan Sandler [Thu, 30 Jan 2014 18:33:41 +0000 (18:33 +0000)]
Merge "Notification visibility APIs."
Dan Sandler [Thu, 30 Jan 2014 16:14:07 +0000 (11:14 -0500)]
Redact public version of screenshot notifications.
It's OK to reveal that a screenshot has been taken, but the public
version of this notification no longer shows the actual screenshot
image itself (in case it was taken before the device was locked
and therefore might contain sensitive information).
Change-Id: I5ba0b64023810ece0cea56ba457968fbde4b0cbe
Dan Sandler [Thu, 23 Jan 2014 20:11:54 +0000 (15:11 -0500)]
SystemUI support for notification visibility.
In this implementation, DISABLE_NOTIFICATION_TICKER (which was never
really used on its own and can be safely subsumed by
DISABLE_NOTIFICATION_ICONS) is now DISABLE_PRIVATE_NOTIFICATIONS;
when this SystemUI bit is set by the keyguard, SystemUI knows to switch
its presentation into "public" mode, in which
VISIBILITY_PRIVATE notifications are replaced with their
publicVersion's contentView (or a placeholder view,
synthesized by SystemUI, that leaks no additional
information about the notification). VISIBILITY_SECRET
notifications are suppressed altogether in this mode.
This behavior is enabled but not activated by default. To
turn it on, run:
$ adb shell settings put secure lock_screen_allow_notifications 1
and restart SystemUI.
Change-Id: Id660bef7737580e16a83f60567c22b53ee81c602
Scott Main [Thu, 30 Jan 2014 18:18:47 +0000 (10:18 -0800)]
am
396954b5: am
84dabc75: am
500db2fe: am
55330921: am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
396954b5a5d0abd246126b119f36a15b67a6ab81':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:15:43 +0000 (18:15 +0000)]
am
84dabc75: am
500db2fe: am
55330921: am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
84dabc75daf3045cc5d59971112589d32972f3b1':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:12:46 +0000 (18:12 +0000)]
am
500db2fe: am
55330921: am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
500db2fed926e50f6fdb60ccb010724143960dd9':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:09:16 +0000 (18:09 +0000)]
am
55330921: am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
55330921c93f3ed6f277fed4d98a2133dd3ab47a':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:06:44 +0000 (18:06 +0000)]
am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
8b6fa56f5cdb66ed1bafb7920ba8299ee8b3034a':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:03:05 +0000 (18:03 +0000)]
am
c1ae12b7: update android studio download to 0.4.2
* commit '
c1ae12b7d891ff3598d03f52a0e817876d7921e3':
update android studio download to 0.4.2
Dan Sandler [Sun, 22 Dec 2013 05:33:41 +0000 (23:33 -0600)]
Notification visibility APIs.
The new visibility property allows an application to signal
to SystemUI whether a notification's contents are safe to
show in "public" situations, i.e. outside of a secure
lockscreen, or whether they should be treated as "private"
(where only the icon is revealed).
Apps that post information that includes no personal or
sensitive information (e.g. a weather alert) can use
VISIBILITY_PUBLIC to allow users to see (and potentially
even dismiss) this kind of notification without unlocking
their devices.
The historical treatment of Android notifications
corresponds to VISIBILITY_PRIVATE, which is the default
visibility setting for all notifications, including apps
that are not aware of this API.
VISIBILITY_PRIVATE notifications may optionally specify a
publicVersion, which is a whole other Notification object
whose contentView will be shown in public contexts. This
allows an app to provide a "redacted" public version of its
notification that is more useful than the system-supplied
version (showing just the icon and app name) but still
conceals private information. For example, a messaging app
that today posts a Notification including the sender and
contents of each message could additionally specify a
publicVersion that says, simply, "N new messages".
There's also VISIBILITY_SECRET for notifications that should
be totally concealed (that is, no icon) in public contexts.
To reveal any hint of this kind of notification would
require the user to unlock the device.
Change-Id: I1552db36c469954d27d3c92ba21ac5c703d47ae1
Scott Main [Thu, 30 Jan 2014 16:55:01 +0000 (08:55 -0800)]
update android studio download to 0.4.2
Change-Id: Icf789bb6a2cfb254b25e865e2a60ec4717887afa
Scott Main [Thu, 30 Jan 2014 16:58:09 +0000 (08:58 -0800)]
am
015d67f4: am
959c5d5e: am
ec20f347: am
46cf9087: am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
015d67f449307f86343efb862b4cb2a9be2e9ad3':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:58:06 +0000 (08:58 -0800)]
am
7874b53c: am
fb6f1e39: am
599bb934: am
759c6305: am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
7874b53c4e31f90cb3de09fef1caea27b1874048':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:55:04 +0000 (16:55 +0000)]
am
959c5d5e: am
ec20f347: am
46cf9087: am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
959c5d5ef9be28a054b6dd61a9f660dfe967351b':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:54:56 +0000 (16:54 +0000)]
am
fb6f1e39: am
599bb934: am
759c6305: am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
fb6f1e390100c292ad305a97f1af31f9d20f0dd4':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:54:46 +0000 (08:54 -0800)]
am
c22327c2: am
cbc8a872: am
648729ad: am
540306be: am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
c22327c2a6c5011bf040a6b52c052c3c68262fe1':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:51:09 +0000 (16:51 +0000)]
am
ec20f347: am
46cf9087: am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
ec20f347e71f6ca35cd88b747a9b0ba2a81744cd':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:50:53 +0000 (16:50 +0000)]
am
cbc8a872: am
648729ad: am
540306be: am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
cbc8a872cc7bbf3bb6d64b262b070e6321644bcc':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:47:16 +0000 (16:47 +0000)]
am
599bb934: am
759c6305: am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
599bb93400d719d2570f8d84bdbc63c9ed4f85d0':
Revert "add api notice to cast package index"
Baligh Uddin [Thu, 30 Jan 2014 16:47:09 +0000 (08:47 -0800)]
am
d966de98: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
d966de98e71c7883b807f1989bf0f4cbcc522b79':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 30 Jan 2014 16:47:06 +0000 (08:47 -0800)]
am
c336fc93: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
c336fc933775651db349492655c03fb78eb15d96':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 30 Jan 2014 16:47:04 +0000 (08:47 -0800)]
am
ced263e4: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
ced263e41dc5a4685d913a7b29cbc5cf554323e7':
Import translations. DO NOT MERGE
Scott Main [Thu, 30 Jan 2014 16:46:59 +0000 (16:46 +0000)]
am
46cf9087: am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
46cf90878e49f15a94db28366da581e9f11c9a4c':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Baligh Uddin [Thu, 30 Jan 2014 16:43:31 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 30 Jan 2014 16:43:29 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 30 Jan 2014 16:43:24 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Scott Main [Thu, 30 Jan 2014 16:43:13 +0000 (16:43 +0000)]
am
648729ad: am
540306be: am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
648729adb4c75199d6464c32cf9eb26cffacb680':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:43:07 +0000 (16:43 +0000)]
am
759c6305: am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
759c6305b227fbb22a031b9ac561f8f23ca41a0f':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:42:44 +0000 (16:42 +0000)]
am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
e49346dcb213cc96f910c798e4aa00688197af9a':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:38:54 +0000 (16:38 +0000)]
am
540306be: am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
540306be15f9d15a93ef05db870653d5a5e7bc38':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:38:46 +0000 (16:38 +0000)]
am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
0d9f5b640c31a5bce699419a93a98acef1471db7':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:38:33 +0000 (16:38 +0000)]
am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
eb35de00dec9444e0c46ac641a74d058be48d547':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:34:52 +0000 (16:34 +0000)]
am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
eee015057a2abfaef2ac7360a5536605e7d74e05':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:34:26 +0000 (16:34 +0000)]
Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:34:26 +0000 (16:34 +0000)]
am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
e627eaeebe061e3fc586a78c8837d1b780d0741b':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:33:50 +0000 (16:33 +0000)]
Revert "add warning to all the new iberico API pages about SDK not available yet"
This reverts commit
e724990230d267c13f8f820b5fdbe7c58b25d344.
Change-Id: I1415bf9542b01b57b1802115466288ec93ab6987
Scott Main [Thu, 30 Jan 2014 16:31:44 +0000 (16:31 +0000)]
Merge "Revert "add api notice to cast package index"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:30:26 +0000 (16:30 +0000)]
am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
36d7dfb7e816836dbc6039237cadd3382e10d5b2':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:28:27 +0000 (16:28 +0000)]
Revert "add api notice to cast package index"
This reverts commit
845bcc6d344765a0ea7cfcf0b4ac398774d06f94.
Change-Id: I07b047f1b44e8b9b32bb4b36b6f858cdef9fed9e
Scott Main [Thu, 30 Jan 2014 16:26:21 +0000 (16:26 +0000)]
Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:25:38 +0000 (16:25 +0000)]
Revert "add api notice to a bunch more files in iberico release"
This reverts commit
c62223a04d15da4240129a9b05ad0be965f08ee4.
Change-Id: If3cee4062e2f48a3c1e365f025701e6d1de9c9d4
Michael Jurka [Thu, 30 Jan 2014 14:41:05 +0000 (06:41 -0800)]
am
2ac4f3b2: Merge "Don\'t set suggested wallpaper dimensions in default wallpaper cropper"
* commit '
2ac4f3b225192dad7bd6ff0788f083317d434534':
Don't set suggested wallpaper dimensions in default wallpaper cropper