OSDN Git Service
Jeff Brown [Fri, 11 Apr 2014 03:47:08 +0000 (03:47 +0000)]
Merge "Plumb display power state through display manager." into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 07:31:55 +0000 (00:31 -0700)]
Plumb display power state through display manager.
Declare a new method, Display.getState() to retrieve the actual
power state of a display.
Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.
Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.
Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.
Eliminated the bright here and woke here policy flags since they
were unused. Simplified the input dispatch policy somewhat.
Ensure that screen wake locks are respected up until the point
when dozing really begins.
Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.
Bug:
13133142
Bug:
13472578
Bug:
13929355
Bug:
13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
Baligh Uddin [Thu, 10 Apr 2014 15:51:37 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Zhihai Xu [Wed, 9 Apr 2014 18:19:04 +0000 (18:19 +0000)]
Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
Jesse Gunsch [Wed, 9 Apr 2014 18:09:02 +0000 (18:09 +0000)]
Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
Andre Eisenbach [Tue, 18 Mar 2014 21:26:51 +0000 (14:26 -0700)]
LE: Return false if an attribute read/write is in progress
bug:
12109128
Change-Id: I0155fcddc850aba47a1bf3e174d4ee582d50b187
Baligh Uddin [Wed, 9 Apr 2014 16:53:03 +0000 (09:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I974afb393ebd8cf341012d3c08cad60b578cda30
Auto-generated-cl: translation import
Jeff Brown [Wed, 9 Apr 2014 04:36:51 +0000 (04:36 +0000)]
Merge "Move certain internal activity manager methods to new class." into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 04:33:27 +0000 (04:33 +0000)]
Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
Jeff Brown [Tue, 8 Apr 2014 02:45:27 +0000 (19:45 -0700)]
Move certain internal activity manager methods to new class.
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.
Deleted the startRunning method since it is no longer useful.
Bug:
13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
Jeff Brown [Wed, 9 Apr 2014 00:26:30 +0000 (17:26 -0700)]
Move display power controller to display manager service. (DO NOT MERGE)
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.
Bug:
13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
Dave Platt [Thu, 13 Mar 2014 23:35:15 +0000 (23:35 +0000)]
Merge "NsdService does not clean up after exiting clients"
Adam Hampson [Tue, 8 Apr 2014 15:51:22 +0000 (15:51 +0000)]
Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev
Baligh Uddin [Tue, 8 Apr 2014 02:16:35 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Narayan Kamath [Fri, 14 Feb 2014 17:14:09 +0000 (17:14 +0000)]
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
(cherry picked from commit
b3802a8e2360aaa0a88faa625e15c31b56eaf125)
Bug:
13763685
Bug:
13763900
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
Adam Hampson [Mon, 7 Apr 2014 21:27:53 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
Robert Greenwalt [Mon, 7 Apr 2014 20:46:58 +0000 (20:46 +0000)]
am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:41:00 +0000 (20:41 +0000)]
am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
331fa429cad1f464f0375a3466ba528b03c6e90d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:37:38 +0000 (20:37 +0000)]
am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:34:49 +0000 (20:34 +0000)]
am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:31:45 +0000 (20:31 +0000)]
am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
5f3c0630e488bbcee687933b6350370a42354dc4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:27:50 +0000 (20:27 +0000)]
am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
463eeb70938403bdca2519d9b71911aab93b9277':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:26:35 +0000 (20:26 +0000)]
am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
522bd7fb3468bc07133c7ff1a02033dcced740b9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:21:52 +0000 (20:21 +0000)]
am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:18:41 +0000 (20:18 +0000)]
am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
24444abff4ad45b731d4f6cd92afed79568773d8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)]
am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
3e604b1198fcab0e3bf2fd29043e4172193db2b5':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:12:56 +0000 (20:12 +0000)]
am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:07:10 +0000 (20:07 +0000)]
am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
128e937108035b77537f279dc0bc85a116906819':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:48:39 +0000 (19:48 +0000)]
am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:47:49 +0000 (19:47 +0000)]
am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:49 +0000 (19:42 +0000)]
am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:32 +0000 (19:42 +0000)]
am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:44 +0000 (19:36 +0000)]
am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:30:10 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
Baligh Uddin [Mon, 7 Apr 2014 16:16:57 +0000 (09:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693
Auto-generated-cl: translation import
quddusc [Sat, 5 Apr 2014 22:32:35 +0000 (22:32 +0000)]
am
b430ec75: am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
b430ec756473330f47bda2d8f0c266b3398169c9':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:27:25 +0000 (22:27 +0000)]
am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
7db3875cdca4c94cb667d2d0cc86718f15e3305c':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:23:35 +0000 (22:23 +0000)]
Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
Etienne Le Grand [Sat, 5 Apr 2014 04:47:14 +0000 (04:47 +0000)]
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
This reverts commit
fd53d8352a4617941b0a0449390aa562a01ea1d3.
Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
Etienne Le Grand [Tue, 25 Mar 2014 04:29:28 +0000 (21:29 -0700)]
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
Narayan Kamath [Thu, 6 Feb 2014 11:50:31 +0000 (11:50 +0000)]
DO NOT MERGE Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).
bug:
12890271
(cherry picked from
047b938f7188c21c07669108c5c68b2358f6b158)
Change-Id: I6ce506131780d7cdeb05df9a7b8322f5494eeab2
Katie McCormick [Fri, 4 Apr 2014 21:31:28 +0000 (21:31 +0000)]
am
f7bffe77: am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
f7bffe7707f31da920a8ff08d013934562e9a43d':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:17:29 +0000 (21:17 +0000)]
am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
fc8ea92df15689d51079212d7d012756ce9298d2':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:12:16 +0000 (21:12 +0000)]
Merge "Doc Update: notification bug fix." into klp-docs
Katie McCormick [Fri, 4 Apr 2014 21:04:36 +0000 (14:04 -0700)]
Doc Update: notification bug fix.
Fixes:
b/
13429906
Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
John Spurlock [Fri, 4 Apr 2014 19:24:09 +0000 (19:24 +0000)]
Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
John Spurlock [Thu, 3 Apr 2014 20:37:27 +0000 (16:37 -0400)]
Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.
Bug:
13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
Ricardo Cervera [Fri, 4 Apr 2014 17:42:44 +0000 (17:42 +0000)]
am
5df82523: am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
5df825237afd016c48dd3577d839825e5161d3e7':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:38:59 +0000 (17:38 +0000)]
am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
ff3d89c08cd69c506ea07fb30a58f88e188b2dd9':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:32:57 +0000 (17:32 +0000)]
Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 17:32:42 +0000 (17:32 +0000)]
am
a821af68: am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
a821af684e2a5f814fc8709518b5f0589c81661e':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:29:00 +0000 (17:29 +0000)]
am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
715139a620383c89e061a2b0650e184bf3382a10':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:26:05 +0000 (10:26 -0700)]
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
Ricardo Cervera [Fri, 4 Apr 2014 17:23:08 +0000 (17:23 +0000)]
Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 17:01:35 +0000 (17:01 +0000)]
am
e2bdd6ae: am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
e2bdd6ae33640430fc4a0d58c263d5af94fdee77':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 16:55:02 +0000 (16:55 +0000)]
am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
6ae21ea7fb37c76429a48a41987c9c0e2c067c31':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 16:51:20 +0000 (16:51 +0000)]
Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 16:46:11 +0000 (09:46 -0700)]
docs: Fixed action bar example. Bug:
13806963
Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
Ricardo Cervera [Fri, 4 Apr 2014 16:30:02 +0000 (16:30 +0000)]
am
c23ab90c: am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
c23ab90c80c76c0f5249190ff26dac1fa5992d3b':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Ricardo Cervera [Fri, 4 Apr 2014 16:25:45 +0000 (16:25 +0000)]
am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
07aac5e346c3fed31254e34d386c6236f1ac3f22':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Baligh Uddin [Fri, 4 Apr 2014 14:30:55 +0000 (14:30 +0000)]
am
b2856041: (-s ours) am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b285604185de1ade346eadb78971712607f54058':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:30:52 +0000 (14:30 +0000)]
am
15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
15fdce9d65b47e2b92bcac78776cc01486cff61a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:28:01 +0000 (14:28 +0000)]
am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
81e62eb1e576388866779e6f29d71614892dcf8a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:25:46 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Fri, 4 Apr 2014 14:22:51 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:45 +0000 (02:21 +0000)]
am
ef5caff8: am
c0086ba5: am
9bcfee1d: (-s ours) am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
ef5caff8b53f3b8ce85277824f14936047bc11d5':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:42 +0000 (02:21 +0000)]
am
e18ae130: am
0bb7ec7e: am
d8b890da: (-s ours) am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
e18ae1303c070759bce117b969186f699baa8564':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:39 +0000 (02:21 +0000)]
am
eca9620e: am
0c44762f: am
8152502e: (-s ours) am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
eca9620e331d72afa933252dc7adb1ae3ed4d692':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:35 +0000 (02:21 +0000)]
am
f1973ae2: am
a1cca5cb: am
29b4986e: (-s ours) am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
f1973ae2107b2202cc7a2436ef1cf941cbfd9ff6':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:32 +0000 (02:21 +0000)]
am
74ad989d: am
77596103: am
ce393373: (-s ours) am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
74ad989de6e5d62791edf15ebdbe45194cba3530':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:29 +0000 (02:21 +0000)]
am
14dee803: am
c7fdfe6b: am
99939cce: (-s ours) am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
14dee803f8a3b532e86613bb18d5cb572d113df9':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:12 +0000 (02:14 +0000)]
am
c0086ba5: am
9bcfee1d: (-s ours) am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c0086ba57f3bba1f9139baf72ed38f79f3e4ac02':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:10 +0000 (02:14 +0000)]
am
0bb7ec7e: am
d8b890da: (-s ours) am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
0bb7ec7ef9523a8e87878251ae0a0502b66e3706':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:07 +0000 (02:14 +0000)]
am
0c44762f: am
8152502e: (-s ours) am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
0c44762ffee58dbcd526ad173934e3ff48fb9ff9':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:04 +0000 (02:14 +0000)]
am
a1cca5cb: am
29b4986e: (-s ours) am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
a1cca5cb0b7ad982983aebac980c4a44827e7eb3':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:01 +0000 (02:14 +0000)]
am
77596103: am
ce393373: (-s ours) am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
77596103b82939887901b04c9a46fab746ad63a7':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:13:59 +0000 (02:13 +0000)]
am
c7fdfe6b: am
99939cce: (-s ours) am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c7fdfe6b67d81a62d79912780b585673043148ab':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:45 +0000 (02:07 +0000)]
am
9bcfee1d: (-s ours) am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
9bcfee1d3ebe9704937e6935ffe7eabd46ebbf08':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:42 +0000 (02:07 +0000)]
am
d8b890da: (-s ours) am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
d8b890da785e386f08e0a3cf6b7094a23af3c8f2':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:39 +0000 (02:07 +0000)]
am
8152502e: (-s ours) am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
8152502e93edfe2f50d678d6860d3c7d1a8b4865':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:36 +0000 (02:07 +0000)]
am
29b4986e: (-s ours) am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
29b4986ecce1592bd2fe62024bb187dded33c0af':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:32 +0000 (02:07 +0000)]
am
ce393373: (-s ours) am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
ce393373b73e1a1f30ce9bb41568d415cab7df49':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:28 +0000 (02:07 +0000)]
am
99939cce: (-s ours) am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
99939cce702b6b5a01be351f1a0b406a16509103':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:58 +0000 (02:01 +0000)]
am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
30e59135b11d196cac2edd97d1ccca3471f3e398':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:55 +0000 (02:01 +0000)]
am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
af60289e692b6b598d550371cc6e41e0b40dd6cd':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:51 +0000 (02:01 +0000)]
am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
07d5f94e6b8a6d3f9caca057830e5cbd4cfa7dac':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:48 +0000 (02:01 +0000)]
am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
5c77c126b258924961a4a9c784177b4bcd403dd0':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:45 +0000 (02:01 +0000)]
am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
ef9f3043f5259fa55376a1522152779295e15da6':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:42 +0000 (02:01 +0000)]
am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
6094daa2626e57c6bd24409f0934090581541e49':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:13 +0000 (01:54 +0000)]
am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c07a48bed2c772dc548423396b208331b22a679a':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:10 +0000 (01:54 +0000)]
am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
70dfe865013f0c8fedf2c9468360a41b02fcce0a':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:08 +0000 (01:54 +0000)]
am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:05 +0000 (01:54 +0000)]
am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b6588c522451f5015c2cbc902d5a72566f979f2b':
Fix NPE in layoutlib. [DO NOT MERGE]
OSDN Git Service
