drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,321 Commits 1 Branch 0 Tags
Commit Graph

174321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
5a2b966ac4 am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'e22cd0f9e6da18fe6827a481774e2998efbb5f46':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:28 +00:00
Geoff Mendal
cd15d99721 am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'dfe8fe3fcf551386d6107b67bc348d88207979c3':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:23 +00:00
Geoff Mendal
682cec120e am 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '39b03e76365d1da92de51da3bd9f7677c7b16af8':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:18 +00:00
Geoff Mendal
8a18ac3d85 am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '7c958e2df0375761a1851cd02ca3aac3ee95f1c5':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:13 +00:00
Geoff Mendal
f23a517add am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'dc43cc88f02bde0917525e9fe274453bc000eb0a':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:08 +00:00
Geoff Mendal
df45d644b6 am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '5c7e4d99402bf0440ebd6713b6680f8abea175a3':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:04 +00:00
Geoff Mendal
a01f5457bc am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'be5aa9dda325a29c3f34cb9a97958c63f120f15e':
  Import translations. DO NOT MERGE
 2015-02-12 23:04:59 +00:00
Geoff Mendal
14720e7a38 am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '6113edf578bba44de85698624026b4f48652fef9':
  Import translations. DO NOT MERGE
 2015-02-12 23:04:54 +00:00
Geoff Mendal
e22cd0f9e6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:29 +00:00
Geoff Mendal
dfe8fe3fcf Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:18 +00:00
Geoff Mendal
39b03e7636 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:58 +00:00
Geoff Mendal
7c958e2df0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:46 +00:00
Geoff Mendal
dc43cc88f0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:17 +00:00
Geoff Mendal
5c7e4d9940 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:58 +00:00
Geoff Mendal
be5aa9dda3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:25 +00:00
Geoff Mendal
6113edf578 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:58:47 +00:00
Geoff Mendal
dd1048e10a Import translations. DO NOT MERGE 
Change-Id: I592c996ee5bd1d20bcd4ea595b3e6cbba08a4d0c
Auto-generated-cl: translation import
 2015-02-12 14:55:57 -08:00
Geoff Mendal
0804199a6e Import translations. DO NOT MERGE 
Change-Id: Ia9e245c983da6b04f3098269e611d1e193899be8
Auto-generated-cl: translation import
 2015-02-12 14:53:58 -08:00
Geoff Mendal
b008c8f73a Import translations. DO NOT MERGE 
Change-Id: I44a5695c1b18476df2114f16e35fbcbf2a0d99c1
Auto-generated-cl: translation import
 2015-02-12 14:51:47 -08:00
Geoff Mendal
899b20e374 Import translations. DO NOT MERGE 
Change-Id: Ic17d83f48e83832042cd417f1196e6f108ad1724
Auto-generated-cl: translation import
 2015-02-12 14:46:15 -08:00
Geoff Mendal
4e7f6a425c Import translations. DO NOT MERGE 
Change-Id: I8cdc3195ba20c25fab9de6c0063667f5250e6e51
Auto-generated-cl: translation import
 2015-02-12 14:42:44 -08:00
Geoff Mendal
3e94f5644c Import translations. DO NOT MERGE 
Change-Id: Ia8018b29159267ee751a6eb84713409f17fca2b8
Auto-generated-cl: translation import
 2015-02-12 14:40:46 -08:00
Geoff Mendal
44f7bdd2e7 Import translations. DO NOT MERGE 
Change-Id: I9c7b354d532f6631e9e1e1500e0c544379f08b2e
Auto-generated-cl: translation import
 2015-02-12 14:35:01 -08:00
Geoff Mendal
926839346d Import translations. DO NOT MERGE 
Change-Id: I687ccfbddefdf63cdf6b5ef561dbf8261d66ce73
Auto-generated-cl: translation import
 2015-02-12 14:32:53 -08:00
Jim Miller
0bb60712f7 am 4bbd3cb3: am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 
* commit '4bbd3cb3e8494de71ac5ac2aed49e6c56c3b9f68':
  Fix accessibility focus bug in statusbar
 2015-02-12 22:10:48 +00:00
Jim Miller
4bbd3cb3e8 am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 
* commit 'b1e80278f80585a1c3f46dbc578bbbafbcbd80c1':
  Fix accessibility focus bug in statusbar
 2015-02-12 22:04:28 +00:00
Jim Miller
b1e80278f8 am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 
* commit 'b2ff8d9a3e5f279e7a60a12f9192e43081e2eef9':
  Fix accessibility focus bug in statusbar
 2015-02-12 21:55:06 +00:00
Jim Miller
b2ff8d9a3e Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 2015-02-12 21:48:11 +00:00
Geoff Mendal
615adb8bc8 am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'a673af77d95f4a3d46e5d71188256b27e06cc442':
  Import translations. DO NOT MERGE
 2015-02-12 19:20:42 +00:00
Geoff Mendal
a673af77d9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 19:13:54 +00:00
Jeremy Joslin
f69f3737ba am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:56:35 +00:00
Geoff Mendal
ceb7ae3170 Import translations. DO NOT MERGE 
Change-Id: Idd108e5eb791007b3604c67ce4a0853a368a445e
Auto-generated-cl: translation import
 2015-02-12 10:51:28 -08:00
Jeremy Joslin
1267462c0b am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit 'f456d4dcc042581cb2a3ba540538898f2cc925b7':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:47:14 +00:00
Jeremy Joslin
f456d4dcc0 am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:41:17 +00:00
Jeremy Joslin
20be0e25ba Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 2015-02-12 18:34:03 +00:00
Benjamin Franz
6076ef9355 am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit 'dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f':
  Fix the javadocs for lock task mode intents.
 2015-02-12 17:02:09 +00:00
Benjamin Franz
dd0027cfda am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit '40ab8bb22979b9e7c76e016b861319f6103eb800':
  Fix the javadocs for lock task mode intents.
 2015-02-12 16:52:34 +00:00
Benjamin Franz
40ab8bb229 am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
  Fix the javadocs for lock task mode intents.
 2015-02-12 16:45:06 +00:00
Narayan Kamath
00e821a860 am c7e48719: Merge "Remove references to persist.sys.language/country." 
automerge: 8be3724

* commit '8be3724a06f7b2d28c6664ca11a03f91f97f0972':
  Remove references to persist.sys.language/country.
 2015-02-12 16:41:41 +00:00
Narayan Kamath
8be3724a06 am c7e48719: Merge "Remove references to persist.sys.language/country." 
* commit 'c7e487193aed3b102d6e55e0817de6e0460e0236':
  Remove references to persist.sys.language/country.
 2015-02-12 16:37:58 +00:00
Narayan Kamath
c7e487193a Merge "Remove references to persist.sys.language/country." 2015-02-12 16:31:08 +00:00
Benjamin Franz
c70d0e71c0 Fix the javadocs for lock task mode intents. 
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
 2015-02-12 16:12:58 +00:00
Narayan Kamath
b61db8229a Remove references to persist.sys.language/country. 
Addresses a couple of TODOs now that all usages have been
removed and fixes a doc that specifies how the emulator locale
can be set.

bug: 17691569

Change-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c
 2015-02-12 13:16:55 +00:00
Neil Fuller
c1a5e82c25 Merge "Remove usages of FloatMath" automerge: a8e8cdb 
automerge: 27316a9

* commit '27316a93e5979859ae98f506eca365784353007a':
  Remove usages of FloatMath
 2015-02-12 10:00:41 +00:00
Neil Fuller
27316a93e5 Merge "Remove usages of FloatMath" 
automerge: a8e8cdb

* commit 'a8e8cdbb17164c0124e04c376110637af96d5e89':
  Remove usages of FloatMath
 2015-02-12 09:57:57 +00:00
Neil Fuller
a8e8cdbb17 Merge "Remove usages of FloatMath" 2015-02-12 09:26:47 +00:00
Neil Fuller
e573aa9371 Remove usages of FloatMath 
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d
 2015-02-12 09:20:31 +00:00
Tao Bao
6d8886ac46 resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp 
Change-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1
 2015-02-11 22:32:05 -08:00
Eino-Ville Talvala
ad5591f819 am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
* commit 'f5d304636d27ea300c092fac0f0214170a89ba39':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 05:54:34 +00:00
Eino-Ville Talvala
f5d304636d am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
* commit '4fa3a80b6cefdc500de6c7daacc7ef3e160a0543':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 05:48:50 +00:00