266907 Commits

Author SHA1 Message Date
Daichi Hirono
f20e49ecb9 Fix warning from error prone.
BUG=29146585

Change-Id: Ic54caecf1abd74affcd902a9561adcdaa8f10c59
2016-06-08 16:21:06 +09:00
Bill Yi
22dcbc3e26 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa -s ours am: b77c51b2cf -s ours
am: 1c39ba201d  -s ours

* commit '1c39ba201d9606c43ad46f55bd1f398933ebcf74':

Change-Id: I8ab6fa2749eeca3e32c2d6254242ed4e8b6f115c
2016-06-07 03:32:37 +00:00
Andreas Gampe
b6c7ed3788 Frameworks/base: Update compiled-classes-phone am: e16dc04bd8 am: 1b84a84f95
am: 90dd85edee

* commit '90dd85edeea14c40b271a6b079c61e7c3f81de8e':

Change-Id: Ic1c9765d65e0490e733b81812e850da3f93ff5ee
2016-06-07 03:32:35 +00:00
Bill Yi
a36ee250ab Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa -s ours am: 0118fbd3ef -s ours
am: 661cd803af  -s ours

* commit '661cd803aff4a42e19893516d053775a41497233':
  Import translations. DO NOT MERGE

Change-Id: Ifc727a9696cfc8c1e16b56bcea58e16b480810f4
2016-06-07 03:29:03 +00:00
Bill Yi
1c39ba201d Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa -s ours
am: b77c51b2cf  -s ours

* commit 'b77c51b2cf5554b74a8af04b1deac7e25a88dae8':

Change-Id: I031acc52eb9560aa9186ff0336b1d5fa7ac8c074
2016-06-07 03:29:02 +00:00
Andreas Gampe
4d4fcf8f9a Frameworks/base: Update compiled-classes-phone am: e16dc04bd8 am: ae702d305f
am: 6b64b15307

* commit '6b64b15307b2ad297cf1f924832c64515aac6f81':
  Frameworks/base: Update compiled-classes-phone

Change-Id: I646727724474b83c725fdb07c8b9ac92334407a0
2016-06-07 03:29:01 +00:00
Andreas Gampe
90dd85edee Frameworks/base: Update compiled-classes-phone am: e16dc04bd8
am: 1b84a84f95

* commit '1b84a84f957e256a920b463862b4f95c0f1b3aa9':

Change-Id: I7d60064c2a306ae11fb18833ae3d83c6ac915b30
2016-06-07 03:28:59 +00:00
Andreas Gampe
f2abe79c5c Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am: ba94385e5f am: 270657c8e7
am: 27ece5e7ee

* commit '27ece5e7ee754bb3842e02ce7121c71ba1e6d8f1':

Change-Id: Ic74887cf6a23c3d20d5bc0713f35e33b67c4f00f
2016-06-07 03:28:59 +00:00
Bill Yi
661cd803af Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa -s ours
am: 0118fbd3ef  -s ours

* commit '0118fbd3ef557461ab4725a06eb9064d622cf88f':
  Import translations. DO NOT MERGE

Change-Id: Icf798098101b876a050d56dedfb417e27b742971
2016-06-07 03:25:44 +00:00
Andreas Gampe
6b64b15307 Frameworks/base: Update compiled-classes-phone am: e16dc04bd8
am: ae702d305f

* commit 'ae702d305ff44a0e4ec59d3a9c5fb153e77587eb':
  Frameworks/base: Update compiled-classes-phone

Change-Id: I10469b84f9f291d931562f7b71be39bc232a86f9
2016-06-07 03:25:41 +00:00
Andreas Gampe
27ece5e7ee Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am: ba94385e5f
am: 270657c8e7

* commit '270657c8e7d429a7f296c8d2789e7b16ff7ffdd8':

Change-Id: Ica8a7d1eddf7b2b0529160e9af9a39f21f744f8b
2016-06-07 03:25:36 +00:00
Andreas Gampe
ff653b287e Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am: ba94385e5f am: 572b0daf85
am: 609168a3d9

* commit '609168a3d98d14c452e0dcac2e323d9956c3c057':
  Frameworks/base: Update preloaded-classes

Change-Id: Ie965e86ec2dde2aa61e50433d194363f5bf2bba4
2016-06-07 03:24:10 +00:00
Bill Yi
5cc5b281bd Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4ce8e19231 -s ours
am: 45f3daff68  -s ours

* commit '45f3daff689f33f3e20285112f981b219a598431':
  Import translations. DO NOT MERGE

Change-Id: I9219d9f062135c92555307ca3cd334614c3e082e
2016-06-07 03:24:07 +00:00
Bill Yi
b77c51b2cf Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 2b92ce7aaa  -s ours

* commit '2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b':
  Import translations. DO NOT MERGE

Change-Id: I058751b2d6f3b01944659df2008956518cbef05b
2016-06-07 03:21:18 +00:00
Andreas Gampe
1b84a84f95 Frameworks/base: Update compiled-classes-phone
am: e16dc04bd8

* commit 'e16dc04bd82464a289eb00f807293c1da33c179c':
  Frameworks/base: Update compiled-classes-phone

Change-Id: I93ae930e1154c523169f144c90918fd07b198f86
2016-06-07 03:21:14 +00:00
Bill Yi
0118fbd3ef Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 2b92ce7aaa  -s ours

* commit '2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b':
  Import translations. DO NOT MERGE

Change-Id: Iec4e17778428bdda04d9ea34010abbdfcfede9c5
2016-06-07 03:21:09 +00:00
Andreas Gampe
ae702d305f Frameworks/base: Update compiled-classes-phone
am: e16dc04bd8

* commit 'e16dc04bd82464a289eb00f807293c1da33c179c':
  Frameworks/base: Update compiled-classes-phone

Change-Id: I6a02ffbf03e5dc22b21c54cc24268f4e6b54459c
2016-06-07 03:21:06 +00:00
Andreas Gampe
609168a3d9 Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am: ba94385e5f
am: 572b0daf85

* commit '572b0daf851126aceefdd3496d41e4352f13898c':
  Frameworks/base: Update preloaded-classes

Change-Id: Id211354ff06f7cd70fdcbb363c0573d004947cfc
2016-06-07 03:21:05 +00:00
Bill Yi
45f3daff68 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4ce8e19231  -s ours

* commit '4ce8e1923168f0ccbd0e7c5acd159c827d55f101':
  Import translations. DO NOT MERGE

Change-Id: Ibc743845940e3d6f43b6d54f2d991fe8fa2d2a94
2016-06-07 03:18:19 +00:00
Andreas Gampe
572b0daf85 Merge "Frameworks/base: Update preloaded-classes" into nyc-dev
am: ba94385e5f

* commit 'ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
  Frameworks/base: Update preloaded-classes

Change-Id: I2c918b2207331cad8d2904f4f314cf9490c4ccac
2016-06-07 03:17:06 +00:00
Andreas Gampe
270657c8e7 Merge "Frameworks/base: Update preloaded-classes" into nyc-dev
am: ba94385e5f

* commit 'ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
  Frameworks/base: Update preloaded-classes

Change-Id: Iaf5270f03ef6214b9d3064f19aa0219b422687c5
2016-06-07 03:17:03 +00:00
TreeHugger Robot
2b92ce7aaa Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 03:13:22 +00:00
TreeHugger Robot
4ce8e19231 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 03:12:33 +00:00
Andreas Gampe
e16dc04bd8 Frameworks/base: Update compiled-classes-phone
Another update.

Bug: 27248115
Change-Id: Ia208b37e9b9b649215ad1024ba0438627bc89f8a
2016-06-07 03:12:03 +00:00
TreeHugger Robot
ba94385e5f Merge "Frameworks/base: Update preloaded-classes" into nyc-dev 2016-06-07 03:09:55 +00:00
Bill Yi
eb54005f54 Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours am: 90c64f02f2 -s ours
am: 7ca38bd8e7  -s ours

* commit '7ca38bd8e798e0d6417eaebff76d219827b6e82d':

Change-Id: Iec7b44924b69f2131d67c5e3834b8cd6f3727a68
2016-06-07 02:47:37 +00:00
Bill Yi
1c326ef2a2 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours am: e4872d1849 -s ours
am: b9e8801f85  -s ours

* commit 'b9e8801f85368ab8ac6609531d39c14612d61602':

Change-Id: Ie88ff1070f2ebc3407ab468f1a406f29ffed1867
2016-06-07 02:47:31 +00:00
Bill Yi
9098ccdd70 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours am: b3d3104969 -s ours" into nyc-mr1-dev-plus-aosp
am: 3658e10468  -s ours

* commit '3658e10468d551b98e54e15bb4cabac153c6258f':
  Import translations. DO NOT MERGE

Change-Id: I1dd3967ed9f6e46d44637a38bd1fa0e4c78af690
2016-06-07 02:41:26 +00:00
Bill Yi
360724ecda Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours am: a2a976498e -s ours" into nyc-mr1-dev-plus-aosp
am: 0a23f89159  -s ours

* commit '0a23f89159bea400d1ed5300056d207d6ff3e783':
  Import translations. DO NOT MERGE

Change-Id: Ib8c76c34661b3c40e2230f9390bffd696e1973df
2016-06-07 02:41:23 +00:00
Bill Yi
7ca38bd8e7 Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours
am: 90c64f02f2  -s ours

* commit '90c64f02f20db0b918c3b9c26d76a8dce3e4e576':

Change-Id: I9e305546e7aac8e3f40814633b2450ce3897b713
2016-06-07 02:40:50 +00:00
Bill Yi
b9e8801f85 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours
am: e4872d1849  -s ours

* commit 'e4872d1849a265e577b9ef66fd0658da897fecce':

Change-Id: I9e555f56da7dcd1ce04406fc80d8716ad4e4cc36
2016-06-07 02:40:46 +00:00
TreeHugger Robot
d151165e13 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:37:34 +00:00
Bill Yi
c30086a8e2 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c52adeb73f -s ours
am: 672cab5856  -s ours

* commit '672cab58568d2cd1e710205a2e746a9eed9dea91':
  Import translations. DO NOT MERGE

Change-Id: I512619eb93c1a8238df4de7d426cafde93ec81f8
2016-06-07 02:36:50 +00:00
Android Build Merger (Role)
3658e10468 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours am: b3d3104969 -s ours" into nyc-mr1-dev-plus-aosp 2016-06-07 02:34:06 +00:00
Android Build Merger (Role)
0a23f89159 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours am: a2a976498e -s ours" into nyc-mr1-dev-plus-aosp 2016-06-07 02:33:46 +00:00
Bill Yi
35243a1f6a Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours
am: b3d3104969  -s ours

* commit 'b3d31049699d94a53523206583408815f578a09f':
  Import translations. DO NOT MERGE

Change-Id: I7ffcfce55ed4c38bf82802a7724f8952b5f1bb60
2016-06-07 02:33:16 +00:00
Bill Yi
734457c729 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours
am: a2a976498e  -s ours

* commit 'a2a976498e5a70afc6c525fce58f48ecf5c9c19f':
  Import translations. DO NOT MERGE

Change-Id: Idc8712fa15780446aa9d2c035b6c1eefea49b449
2016-06-07 02:33:14 +00:00
Bill Yi
672cab5856 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: c52adeb73f  -s ours

* commit 'c52adeb73f1dc992fd9771b9c80f5209dd0f7a64':
  Import translations. DO NOT MERGE

Change-Id: Iec2abf34165c65d077037928387150688f64420d
2016-06-07 02:31:59 +00:00
Bill Yi
b37799dc36 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ffe7746437 -s ours
am: 02914bc95b  -s ours

* commit '02914bc95badcda08e8f0f46fa80b5ae5bc75f49':
  Import translations. DO NOT MERGE

Change-Id: Ia03a3fbd0937327715e12911ce71c613eeabbb8e
2016-06-07 02:31:05 +00:00
TreeHugger Robot
23c2ec20b7 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:29:02 +00:00
TreeHugger Robot
3c006b4936 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:28:43 +00:00
TreeHugger Robot
cd17b663c3 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:28:25 +00:00
TreeHugger Robot
6b94dfcb61 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:28:04 +00:00
Bill Yi
b3d3104969 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f3d2c06146  -s ours

* commit 'f3d2c06146535052a6b901ac3707b0cab9b4dedd':
  Import translations. DO NOT MERGE

Change-Id: I45a645fa1affcb646938ae71710634a87008464c
2016-06-07 02:27:55 +00:00
TreeHugger Robot
cbfd66566c Merge "Import translations. DO NOT MERGE" 2016-06-07 02:27:55 +00:00
Bill Yi
a2a976498e Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93e807485e  -s ours

* commit '93e807485edc5de8b549b7d5a5ce7e52f5315094':
  Import translations. DO NOT MERGE

Change-Id: Ib8d00f5d63a48aa529393edc29c226c11824c476
2016-06-07 02:27:48 +00:00
Bill Yi
90c64f02f2 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f3d2c06146  -s ours

* commit 'f3d2c06146535052a6b901ac3707b0cab9b4dedd':
  Import translations. DO NOT MERGE

Change-Id: Ie6bc9da984bc94b51d091bf3a3b4c035ff83aba6
2016-06-07 02:27:37 +00:00
Bill Yi
e4872d1849 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93e807485e  -s ours

* commit '93e807485edc5de8b549b7d5a5ce7e52f5315094':
  Import translations. DO NOT MERGE

Change-Id: Ic44082939456434a33682a1f5c2cee4a0f4b3d9d
2016-06-07 02:27:32 +00:00
TreeHugger Robot
3412730a17 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:27:22 +00:00
TreeHugger Robot
0110588254 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:26:45 +00:00