220336 Commits

Author SHA1 Message Date
Geoff Mendal
fadc640b8a Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 457d7bb5ab -s ours am: eb92dc26f3 -s ours
am: 39eb16c482  -s ours

* commit '39eb16c482d10cec29ef0849541b1062c9444ff6':
  Import translations. DO NOT MERGE
2015-10-21 18:41:40 +00:00
Anthony Hugh
90814f0006 Give watch Home app location permissions by default
BUG: 24973857
Change-Id: Ia2758a1822791fb89e6e1f6f20daba9e93cf1794
2015-10-21 11:41:34 -07:00
Anthony Hugh
d4539926a3 Watch dialer should have phone permission fixed
Watch dialer should have phone permission as fixed.

BUG: 24976862
Change-Id: I8bbc63ab0d7dfb2e38eec641681ac9aacae330a0
2015-10-21 11:39:35 -07:00
Nathan Harold
5d1429e0dd Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Bug: 23979591
Change-Id: I16ffa7666fdf0eb081bb1bafa57ebd384d7c3fdf
2015-10-21 11:32:51 -07:00
Geoff Mendal
a638d421ec Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 255103a79f -s ours
am: f0e4b99bd4  -s ours

* commit 'f0e4b99bd4f4630225f1358e50b1f954130c58fe':
  Import translations. DO NOT MERGE
2015-10-21 18:32:18 +00:00
Geoff Mendal
39eb16c482 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 457d7bb5ab -s ours
am: eb92dc26f3  -s ours

* commit 'eb92dc26f3a54adec12d952bae25c7a790c595b7':
  Import translations. DO NOT MERGE
2015-10-21 18:30:36 +00:00
Geoff Mendal
459fdf95c6 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9e30c4b406 -s ours am: 93e157a883 -s ours
am: dbc1d73ffc  -s ours

* commit 'dbc1d73ffc5d65e9e0de68715da205598dd19860':
  Import translations. DO NOT MERGE
2015-10-21 18:28:11 +00:00
Geoff Mendal
413122dbee Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 6e66ac8e66 -s ours am: 71829e47ae -s ours
am: 48bde67af0  -s ours

* commit '48bde67af050c376f716dd0f8d5bb17cd9c7575c':
  Import translations. DO NOT MERGE
2015-10-21 18:26:49 +00:00
Geoff Mendal
1e363ad03b Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 18:25:53 +00:00
Geoff Mendal
dd78df5884 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7c6d61e8eb -s ours am: 596e71a3d4 -s ours
am: ee9e812984  -s ours

* commit 'ee9e81298494b4246ef9c77848d2594f8a34d646':
  Import translations. DO NOT MERGE
2015-10-21 18:25:06 +00:00
Geoff Mendal
f0e4b99bd4 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 255103a79f  -s ours

* commit '255103a79f1ffd4e7511c7281618404dcc06a4ba':
  Import translations. DO NOT MERGE
2015-10-21 18:24:03 +00:00
Geoff Mendal
d4b0673f1d Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7c6d61e8eb -s ours am: 596e71a3d4 -s ours
am: ee9e812984  -s ours

* commit 'ee9e81298494b4246ef9c77848d2594f8a34d646':
  Import translations. DO NOT MERGE
2015-10-21 18:23:54 +00:00
Geoff Mendal
eb92dc26f3 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 457d7bb5ab  -s ours

* commit '457d7bb5abec387076c5c28438a4ecca7bc95bd4':
  Import translations. DO NOT MERGE
2015-10-21 18:22:43 +00:00
Tao Bao
2c3b24ea5d Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 18:22:42 +00:00
Tao Bao
48d7b31b4b Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f am: ac140e7f76
am: db33bfc2a9

* commit 'db33bfc2a96c38eba5b67c82cb4fee69c52b80ad':
  Clean up the uncrypted OTA package on bootup.
2015-10-21 18:22:13 +00:00
Geoff Mendal
3f0aaa9f7e Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: a2c9a412f4

* commit 'a2c9a412f463da91bc3ae35c5ea60d8ba920a104':
2015-10-21 18:20:47 +00:00
Geoff Mendal
584cae9a3b Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: a2c9a412f4

* commit 'a2c9a412f463da91bc3ae35c5ea60d8ba920a104':
2015-10-21 18:17:39 +00:00
Geoff Mendal
dbc1d73ffc Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9e30c4b406 -s ours
am: 93e157a883  -s ours

* commit '93e157a883e3c8ab5f4ff434cb33a6c71ad01a94':
  Import translations. DO NOT MERGE
2015-10-21 18:17:22 +00:00
Geoff Mendal
0192d592dc Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a73a642bfe -s ours am: ea6ea27ba6 -s ours
am: 7dd2ea1f4e  -s ours

* commit '7dd2ea1f4ee9f2df25b3705ff5273076a948b6a1':
  Import translations. DO NOT MERGE
2015-10-21 18:16:22 +00:00
Geoff Mendal
48bde67af0 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 6e66ac8e66 -s ours
am: 71829e47ae  -s ours

* commit '71829e47aec78ef2a3cc99649c99b7f08af590d9':
  Import translations. DO NOT MERGE
2015-10-21 18:16:04 +00:00
Geoff Mendal
2fbefc0636 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 18:15:27 +00:00
Geoff Mendal
7f9e943764 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: f4bce5229e

* commit 'f4bce5229e0ee9b2ba8d131d8d4c931384a56bd1':
2015-10-21 18:15:01 +00:00
Geoff Mendal
ee9e812984 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7c6d61e8eb -s ours
am: 596e71a3d4  -s ours

* commit '596e71a3d45b4a968cc8205953ccf5454b6a42d3':
  Import translations. DO NOT MERGE
2015-10-21 18:13:20 +00:00
Geoff Mendal
22868613bf Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 18:11:59 +00:00
Geoff Mendal
963b4821d2 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: f4bce5229e

* commit 'f4bce5229e0ee9b2ba8d131d8d4c931384a56bd1':
2015-10-21 18:11:15 +00:00
Geoff Mendal
58e92750ca Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 1622b4459a
am: 666af89eac

* commit '666af89eac3447a367f6df4f4fddd34942902331':
2015-10-21 18:09:39 +00:00
Geoff Mendal
255103a79f Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 18:07:42 +00:00
Geoff Mendal
a1098c7b68 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 1622b4459a
am: 666af89eac

* commit '666af89eac3447a367f6df4f4fddd34942902331':
2015-10-21 18:07:22 +00:00
Geoff Mendal
457d7bb5ab Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 18:07:12 +00:00
Geoff Mendal
516009d01a Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 18:06:01 +00:00
Geoff Mendal
fc1dd5007e Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: 3d6ca8017d

* commit '3d6ca8017d5fb55b5dabc290723467dd469bfabe':
2015-10-21 18:05:51 +00:00
Tao Bao
db33bfc2a9 Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f
am: ac140e7f76

* commit 'ac140e7f7690979378897546e7934381f62922ab':
  Clean up the uncrypted OTA package on bootup.
2015-10-21 18:05:18 +00:00
Geoff Mendal
ca2f429744 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: 3d6ca8017d

* commit '3d6ca8017d5fb55b5dabc290723467dd469bfabe':
2015-10-21 18:04:19 +00:00
Geoff Mendal
d19391cc28 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2 am: c6fe063ddf
am: 86f2721e96

* commit '86f2721e961863adfb58604c41bb70a232112e2c':
  Import translations. DO NOT MERGE
2015-10-21 18:03:46 +00:00
Geoff Mendal
93e157a883 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 9e30c4b406  -s ours

* commit '9e30c4b4062296bd1eb918d20b6f28032644d820':
  Import translations. DO NOT MERGE
2015-10-21 18:01:40 +00:00
Geoff Mendal
db6e9fb776 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 18:01:08 +00:00
Geoff Mendal
ef40d8360c Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: 221e22d027

* commit '221e22d0277a848504df0169dc40ec1a2fe244df':
2015-10-21 18:00:23 +00:00
Geoff Mendal
f5f7cb4449 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2 am: c6fe063ddf
am: 86f2721e96

* commit '86f2721e961863adfb58604c41bb70a232112e2c':
  Import translations. DO NOT MERGE
2015-10-21 18:00:23 +00:00
Geoff Mendal
71829e47ae Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 6e66ac8e66  -s ours

* commit '6e66ac8e6624d818ce8675ecc74b05452103bb22':
  Import translations. DO NOT MERGE
2015-10-21 18:00:18 +00:00
Geoff Mendal
51132a98dd Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 17:58:50 +00:00
Geoff Mendal
596e71a3d4 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 7c6d61e8eb  -s ours

* commit '7c6d61e8eb9bfb27a038f48d2719c87bd6022e79':
  Import translations. DO NOT MERGE
2015-10-21 17:58:36 +00:00
Geoff Mendal
da4b9fc235 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: 221e22d027

* commit '221e22d0277a848504df0169dc40ec1a2fe244df':
2015-10-21 17:58:15 +00:00
Geoff Mendal
517e67f9b0 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 899d016e89
am: 129ae4421d

* commit '129ae4421df203b4f5cb5b1bd572cffdecfb32da':
2015-10-21 17:58:09 +00:00
Geoff Mendal
9e30c4b406 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:56:23 +00:00
Geoff Mendal
fd9f72520f Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 17:55:15 +00:00
Geoff Mendal
6e66ac8e66 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:55:04 +00:00
Geoff Mendal
c8dae39a77 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: 947dada111

* commit '947dada111e47304b5a1bb9592490f2b42138ada':
2015-10-21 17:54:50 +00:00
Geoff Mendal
9cdee95225 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 899d016e89
am: 129ae4421d

* commit '129ae4421df203b4f5cb5b1bd572cffdecfb32da':
2015-10-21 17:54:22 +00:00
Geoff Mendal
56bf3090fe Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 17:53:37 +00:00
Geoff Mendal
7fef2a2174 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours am: 762ce0fc44 -s ours am: 96b250771e -s ours
am: 86b9bcd907  -s ours

* commit '86b9bcd90771947bb0f46aecbe6849d5e22821c9':
2015-10-21 17:53:10 +00:00