aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBill Yi2017-08-233-35/+19
| | | | | | Change-Id: I7038e2c26f5ecd353406d34c9eeb0c1bc7fa7c57 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-162-5/+5
|\
| * Import translations. DO NOT MERGEBill Yi2017-08-162-5/+5
| | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64680434 Change-Id: Ie15c81f25c8b40e9ef192de30a2b94e839288df3
* | Import translations. DO NOT MERGEBill Yi2017-08-163-3/+3
|/ | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64680434 Change-Id: Ib9a653ad32a63cd9437c20c14681252789288c1e
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-128-9/+201
|\
| * Import translations. DO NOT MERGEBill Yi2017-08-128-9/+201
| | | | | | | | | | | | Change-Id: I76c33780c0b0827c97fdb9354a6b6d37bfb56fe0 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-126-5/+3081
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-126-5/+3081
| |/ | | | | | | | | | | Change-Id: I0fafd29d4a1a42b760c86d8f94b360ceb1587e1c Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-124-4/+420
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-124-4/+420
| |/ | | | | | | | | | | Change-Id: Iace3a78d16e7fb6befee6bc99f45798f77bea78f Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-122-0/+54
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-122-0/+54
| |/ | | | | | | | | | | Change-Id: I94713963c5e83583267f838480c8a3f2170a0391 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-122-0/+48
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-122-0/+48
| |/ | | | | | | | | | | Change-Id: Icc8bd464ef3d2da0d99b33e16f7f87ddb99d4c93 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-122-0/+62
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-122-0/+62
| |/ | | | | | | | | | | Change-Id: I1c8a8f2d4d713e90bd4784834acdd12938434e2a Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* / Import translations. DO NOT MERGEBill Yi2017-08-1210-32/+456
|/ | | | | | Change-Id: I1a1e794d56db2dc8f9ab213b886854ffef733d98 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-091-1/+1
|\
| * Import translations. DO NOT MERGEThe Android Open Source Project2017-08-091-1/+1
| | | | | | | | | | | | Change-Id: Ia6f178c5c6a921d7e5c1576aaa780e1f5378fb59 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Import translations. DO NOT MERGEThe Android Open Source Project2017-08-091-1/+1
|/ | | | | | Change-Id: Iccc7c02608439dce3ec527b6b871a76590b250b2 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-07-281-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-07-281-1/+1
| | | | | | | | | | | | Change-Id: I2c1ffb0c16145566cf99d5661cfe17e830faba2f Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Import translations. DO NOT MERGEBill Yi2017-07-281-1/+1
|/ | | | | | Change-Id: Ica69ab3230d61d533183d26e67d0cfd7a2107bd9 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* Import translations. DO NOT MERGEBill Yi2017-07-191-1/+1
| | | | | | Change-Id: I488bc50df2eb0e76171bcecd41717c28ffb4e56c Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* Import translations. DO NOT MERGEBill Yi2017-07-131-2/+2
| | | | | | Change-Id: I93dd89f9cd29db52a2660b162a2c00959dc040d2 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* Import translations. DO NOT MERGEBill Yi2017-06-271-1/+1
| | | | | Change-Id: I5ee735229f2f06ddf12332496d7cc4d27c4bb87c Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-06-221-1/+1
| | | | | Change-Id: I9670b44e5df11ebb9b81a31afff8f5167e178057 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-06-211-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-06-201-1/+1
| | | | | | | | | | Change-Id: Ia8378e5bcb82aafaf51d0e877a14b83c46f21fe1 Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-06-211-1/+1
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-06-201-1/+1
| |/ | | | | | | | | Change-Id: Ia1ba3afca4c2e76f073d9f0fbe4b1cb317eadd59 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBill Yi2017-06-201-2/+2
|/ | | | | Change-Id: I67380e155bb7d31b62e7a429d01823d34b9c57cd Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-06-121-1/+1
| | | | | Change-Id: I339bad8aea01e66659787d8a9a06ce01112e03c5 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-311-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-05-311-1/+1
| | | | | | | | | | Change-Id: I8f7f8dd206a91c73781fbcf24900a631f90f3474 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2017-05-311-1/+1
|/ | | | | Change-Id: I7bc939b0a283fe72d730e9ad0084e1ffa4bd50db Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-05-222-4/+4
| | | | | Change-Id: Ib413b1988ad8828fdd42b34e9a2ad26c6237ce5a Auto-generated-cl: translation import
* Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63Adam Lesinski2017-05-191-1/+6
|\ | | | | | | | | | | am: e777c7bdc7 Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49
| * Merge "Revert "Revert "Use AAPT2""" into oc-devAdam Lesinski2017-05-191-1/+6
| |\ | | | | | | | | | | | | | | | am: e6cfc2ff63 Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb
| | * Merge "Revert "Revert "Use AAPT2""" into oc-devTreeHugger Robot2017-05-191-1/+6
| | |\
| | | * Revert "Revert "Use AAPT2""Adam Lesinski2017-05-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af1177453d95d727651cf48a380d7979dc94ae45. Reason for revert: Bug in aapt2 was fixed b/38152130 Change-Id: I2701d67f581165d371a745749367c0c825168e22
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-163-11/+11
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-163-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I433c4b65242ec711f0198a52e3041e8e2449f8cc Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-161-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2017-05-161-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I59054386d3666143821916c57c3ce9b6cbb3aaa1 Auto-generated-cl: translation import
* | | | | Merge "Revert "Use AAPT2"" into oc-dev am: 3ac57504cdAlan Viverette2017-05-161-6/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | am: 811b5295df Change-Id: Ifbf1782b7c55f7414b29215711c9cb08b69dd256
| * | | Merge "Revert "Use AAPT2"" into oc-devAlan Viverette2017-05-161-6/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: 3ac57504cd Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67
| | * | Merge "Revert "Use AAPT2"" into oc-devTreeHugger Robot2017-05-161-6/+1
| | |\|
| | | * Revert "Use AAPT2"Alan Viverette2017-05-151-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f6f5c017629befcc4b8d9f1111e18d3505bfac1. Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee
| | * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-112-2/+2
| | |\ \