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

229344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
ddee7d949d Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev 2016-01-11 14:57:38 +00:00
Geoff Mendal
38aaa9981a Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours 
am: 9f094ac04d  -s ours

* commit '9f094ac04d55cc3a2da2038cc3f3e46dc472269b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:57:07 +00:00
Geoff Mendal
7053b8926f Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours 
am: 9f094ac04d  -s ours

* commit '9f094ac04d55cc3a2da2038cc3f3e46dc472269b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:56:01 +00:00
Geoff Mendal
67ba224dbf Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours am: 4ae777097e -s ours 
am: 23c92d99cf  -s ours

* commit '23c92d99cf4f613f212710e73bb46c9c5895918f':
  Import translations. DO NOT MERGE
 2016-01-11 14:54:39 +00:00
Geoff Mendal
9f094ac04d Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours 
am: 0b8de39728  -s ours

* commit '0b8de39728014ad51ff6784a3850a3d752f715e3':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:52:22 +00:00
Geoff Mendal
23c92d99cf Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours 
am: 4ae777097e  -s ours

* commit '4ae777097e4242e546c0b7e477cbd0829689dff5':
  Import translations. DO NOT MERGE
 2016-01-11 14:50:39 +00:00
Geoff Mendal
0b8de39728 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours 
am: 14c37a57ea  -s ours

* commit '14c37a57eaf9fe962fe7ee9ecb33bc883ededf7b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:45:46 +00:00
Geoff Mendal
14c37a57ea Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours 
am: b409a99ccc  -s ours

* commit 'b409a99ccc0a42814f3918c689d06526c09f726b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:41:17 +00:00
Geoff Mendal
2cc8fdc8a0 Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours am: eab7785333 -s ours am: 2ed7b6d82a -s ours am: d344dc256b -s ours am: ac724be37b -s ours 
am: ed3b0f43b4  -s ours

* commit 'ed3b0f43b4c671f577be95d125dfbe030c9250c8':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:41:15 +00:00
Geoff Mendal
b409a99ccc Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours 
am: 009fb756ec  -s ours

* commit '009fb756ecabd78e5300c619c267f2e55cfd0922':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:36:52 +00:00
Geoff Mendal
ed3b0f43b4 Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours am: eab7785333 -s ours am: 2ed7b6d82a -s ours am: d344dc256b -s ours 
am: ac724be37b  -s ours

* commit 'ac724be37b04467a11e8588821f356840f1ea98a':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:36:51 +00:00
Geoff Mendal
ac724be37b Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours am: eab7785333 -s ours am: 2ed7b6d82a -s ours 
am: d344dc256b  -s ours

* commit 'd344dc256bf0a2b786e1a1f1e99acf3f83b97e75':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:32:36 +00:00
Geoff Mendal
009fb756ec Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours 
am: 4df8f4abe0  -s ours

* commit '4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:32:35 +00:00
Geoff Mendal
4df8f4abe0 Revert "Import translations. DO NOT MERGE" 
am: 8874f9754f  -s ours

* commit '8874f9754f909dafcc2c5c23109e35297263f469':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:28:57 +00:00
Geoff Mendal
d344dc256b Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours am: eab7785333 -s ours 
am: 2ed7b6d82a  -s ours

* commit '2ed7b6d82a921f085ee22914ecb0a09456ac44ed':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:28:55 +00:00
Geoff Mendal
8874f9754f Revert "Import translations. DO NOT MERGE" 
This reverts commit 9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.

Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
 2016-01-11 14:24:19 +00:00
Geoff Mendal
2ed7b6d82a Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours 
am: eab7785333  -s ours

* commit 'eab778533331bc25b3b201ebb9519a016a451ae4':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:22:02 +00:00
Geoff Mendal
4ae777097e Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours 
am: 8ea585955c  -s ours

* commit '8ea585955c8aa06daa87a6690421f73f98bb036e':
  Import translations. DO NOT MERGE
 2016-01-11 14:16:41 +00:00
Geoff Mendal
636adbb751 Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours am: a6a761d9fd -s ours am: a8ae80950e -s ours am: 82666a9f2a -s ours am: 9fd00d42dd -s ours 
am: 691fd4482b  -s ours

* commit '691fd4482b1f95ac1c21de542fed63475ee23444':
  Import translations. DO NOT MERGE
 2016-01-11 14:16:40 +00:00
Geoff Mendal
eab7785333 Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours 
am: 1c51eb41ee  -s ours

* commit '1c51eb41ee57bb2aeff62dd23576c6565a86de17':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:16:40 +00:00
Geoff Mendal
3b256943cd Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours am: f272b0a87e -s ours am: 0c6bf20b04 -s ours am: 62e77bd206 -s ours am: 2c433acc20 -s ours 
am: 86d0aeca75  -s ours

* commit '86d0aeca755acaef4f8d366d836651eb4b833eaa':
  Import translations. DO NOT MERGE
 2016-01-11 14:14:17 +00:00
Geoff Mendal
8ea585955c Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours 
am: 42692affe2  -s ours

* commit '42692affe23352b7e0bbcc9ef4d6f5fb661cc943':
  Import translations. DO NOT MERGE
 2016-01-11 14:11:44 +00:00
Geoff Mendal
1c51eb41ee Revert "Import translations. DO NOT MERGE" 
am: 9e5fe1a7da  -s ours

* commit '9e5fe1a7da02055c03b434db04f0927ba174f3f9':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:11:44 +00:00
Geoff Mendal
691fd4482b Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours am: a6a761d9fd -s ours am: a8ae80950e -s ours am: 82666a9f2a -s ours 
am: 9fd00d42dd  -s ours

* commit '9fd00d42ddf63041fc58275d7cb921e7feb50cc1':
  Import translations. DO NOT MERGE
 2016-01-11 14:11:43 +00:00
Geoff Mendal
86d0aeca75 Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours am: f272b0a87e -s ours am: 0c6bf20b04 -s ours am: 62e77bd206 -s ours 
am: 2c433acc20  -s ours

* commit '2c433acc20dedccefd0f5dd8dcf311d82a2e435f':
  Import translations. DO NOT MERGE
 2016-01-11 14:08:40 +00:00
Geoff Mendal
9fd00d42dd Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours am: a6a761d9fd -s ours am: a8ae80950e -s ours 
am: 82666a9f2a  -s ours

* commit '82666a9f2a1cee49a23291602128b257abf9a64f':
  Import translations. DO NOT MERGE
 2016-01-11 14:07:45 +00:00
Geoff Mendal
42692affe2 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours 
am: 83bf32ebe5  -s ours

* commit '83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
  Import translations. DO NOT MERGE
 2016-01-11 14:05:05 +00:00
Geoff Mendal
9e5fe1a7da Revert "Import translations. DO NOT MERGE" 
This reverts commit f7e5202668cd2b0dc26a65e46b68a4267567bce0.

Change-Id: Ia54e4b766ea2a9f9815baef29df546605d1c3672
 2016-01-11 14:04:51 +00:00
Geoff Mendal
840cb6d691 Merge "Import translations. DO NOT MERGE" 2016-01-11 14:03:05 +00:00
Geoff Mendal
2c433acc20 Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours am: f272b0a87e -s ours am: 0c6bf20b04 -s ours 
am: 62e77bd206  -s ours

* commit '62e77bd206c2c3dd69ca62b5f02d5550559012d3':
  Import translations. DO NOT MERGE
 2016-01-11 14:02:31 +00:00
Geoff Mendal
e8a594bd79 Merge "Import translations. DO NOT MERGE" 2016-01-11 14:02:30 +00:00
Geoff Mendal
83bf32ebe5 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours 
am: b441c6926b  -s ours

* commit 'b441c6926bbc977956cd1cb6afcc338b09e5d6e3':
  Import translations. DO NOT MERGE
 2016-01-11 13:59:58 +00:00
Geoff Mendal
82666a9f2a Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours am: a6a761d9fd -s ours 
am: a8ae80950e  -s ours

* commit 'a8ae80950eae564cae9b8bf3b8146eede57317c7':
  Import translations. DO NOT MERGE
 2016-01-11 13:59:57 +00:00
Geoff Mendal
73ffe1a9d6 Import translations. DO NOT MERGE 
Change-Id: I582f2e3659c92e18880ec1970a42dcb4d9e44cfe
Auto-generated-cl: translation import
 2016-01-11 05:59:44 -08:00
Geoff Mendal
62e77bd206 Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours am: f272b0a87e -s ours 
am: 0c6bf20b04  -s ours

* commit '0c6bf20b04b8eb3c3b66d563ed497491ddb511c5':
  Import translations. DO NOT MERGE
 2016-01-11 13:57:31 +00:00
Geoff Mendal
b2260b3a31 Import translations. DO NOT MERGE 
Change-Id: I0a479b16ae9a28bf6f798f4db4525b7360c40812
Auto-generated-cl: translation import
 2016-01-11 05:56:07 -08:00
Geoff Mendal
b441c6926b Import translations. DO NOT MERGE 
am: 9f9e736e0d  -s ours

* commit '9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4':
  Import translations. DO NOT MERGE
 2016-01-11 13:54:49 +00:00
Geoff Mendal
a8ae80950e Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours 
am: a6a761d9fd  -s ours

* commit 'a6a761d9fdbcae6c62fc50f0a36c64c57c8c7403':
  Import translations. DO NOT MERGE
 2016-01-11 13:54:46 +00:00
Geoff Mendal
0c6bf20b04 Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours 
am: f272b0a87e  -s ours

* commit 'f272b0a87ed5af0317285ef047cf95cd4601ebca':
  Import translations. DO NOT MERGE
 2016-01-11 13:52:00 +00:00
Geoff Mendal
a6a761d9fd Import translations. DO NOT MERGE am: a4505e9264 -s ours 
am: bc3b9e2a83  -s ours

* commit 'bc3b9e2a83909cb170de2d48023db2d67388162f':
  Import translations. DO NOT MERGE
 2016-01-11 13:49:05 +00:00
Geoff Mendal
9f9e736e0d Import translations. DO NOT MERGE 
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
 2016-01-11 08:46:48 -05:00
Geoff Mendal
f272b0a87e Import translations. DO NOT MERGE am: f7e5202668 -s ours 
am: 0b1a880876  -s ours

* commit '0b1a88087604f1f94d616934947a530c8ea40f0f':
  Import translations. DO NOT MERGE
 2016-01-11 13:46:15 +00:00
Geoff Mendal
bc3b9e2a83 Import translations. DO NOT MERGE 
am: a4505e9264  -s ours

* commit 'a4505e926410cbf20dcd301f35f3496628cad9de':
  Import translations. DO NOT MERGE
 2016-01-11 13:43:25 +00:00
Geoff Mendal
d7483de165 Import translations. DO NOT MERGE 
Change-Id: I519c2c15b3ae10ec47a76de7afff6fea223ba1c9
Auto-generated-cl: translation import
 2016-01-11 05:41:24 -08:00
Geoff Mendal
0b1a880876 Import translations. DO NOT MERGE 
am: f7e5202668  -s ours

* commit 'f7e5202668cd2b0dc26a65e46b68a4267567bce0':
  Import translations. DO NOT MERGE
 2016-01-11 13:40:07 +00:00
Geoff Mendal
a4505e9264 Import translations. DO NOT MERGE 
Change-Id: I3480788044f57b8097e54c28cb7984024719b8ca
Auto-generated-cl: translation import
 2016-01-11 08:34:53 -05:00
Geoff Mendal
f7e5202668 Import translations. DO NOT MERGE 
Change-Id: I2591758894a20c8459e7161ab6d97ac3a9a32654
Auto-generated-cl: translation import
 2016-01-11 08:22:53 -05:00
Jerome Gaillard
b63da06a7a Get color state list file content from PSI instead of disk 
Use new functionality from callback to get the content of state list files
from PSI instead of disks.

Bug: http://b.android.com/183767
Change-Id: Ic256d1e7787209d772ccd42c2e3c7f409cac2964
 2016-01-11 11:37:19 +00:00
Daichi Hirono
df7a1d69ea Merge "Clean up TestUtil." 2016-01-11 08:00:35 +00:00
Daichi Hirono
ab03cb1b46 Clean up TestUtil. 
* Integrate two while loops waiting for valid device.
 * Try to open a device just after getting an device ownership so that
   other applicaitons do not steal device ownership before TestUtil
   opens a device.

Change-Id: Ia273cfb2a47fe630efd8c54b22d6ef5823a402b8
 2016-01-11 16:32:57 +09:00