aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: c1b04d9d03 -s ours am: f33f6a5adc -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c61200a139 -s ours am: f9e41a1061 -s ours am: be3b42333a -s ours am: 9d1eade5b7 -s ours am: c727509d10 -s ours Change-Id: I6a71bde36bf35fe985c55cfc9ac321aca9135e84
| * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: c1b04d9d03 -s ours am: f33f6a5adc -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c61200a139 -s ours am: f9e41a1061 -s ours am: be3b42333a -s ours am: 9d1eade5b7 -s ours Change-Id: I435ed18c56f6f2f113d98cbf31e81ecae78ecd92
| | * | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: c1b04d9d03 -s ours am: f33f6a5adc -s ↵Bill Yi2016-08-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c61200a139 -s ours am: f9e41a1061 -s ours am: be3b42333a -s ours Change-Id: If09174e02f2c72dbdc9bd26121f3f4157c9b64ed
| | | * | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: c1b04d9d03 -s ours am: f33f6a5adc -s ↵Bill Yi2016-08-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c61200a139 -s ours am: f9e41a1061 -s ours Change-Id: I4236bf67b979ae4a4d89548291e4d4161d455415
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: d5923d03c5 -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b1e0f8f5a1 -s ours am: ea395ff086 -s ours am: 52345cde75 -s ours am: c8f5661f4b -s ours am: 7b56af3ed5 -s ours am: 2a34d49185 -s ours Change-Id: I9b1500ac20a4b37f79c8f80a945ed0afcfec5186
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: d5923d03c5 -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b1e0f8f5a1 -s ours am: ea395ff086 -s ours am: 52345cde75 -s ours am: c8f5661f4b -s ours am: 7b56af3ed5 -s ours Change-Id: I349ee8afd32208cac3b51be8332b03c42c76cc18
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: d5923d03c5 -s ↵Bill Yi2016-08-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b1e0f8f5a1 -s ours am: ea395ff086 -s ours am: 52345cde75 -s ours am: c8f5661f4b -s ours Change-Id: I1b6771573cf7c9e0db4c2daa381bafe4178191fb
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: d5923d03c5 -s ↵Bill Yi2016-08-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b1e0f8f5a1 -s ours am: ea395ff086 -s ours am: 52345cde75 -s ours Change-Id: Ic05bf53a9afc7561d5b02d5a5cff5ed7d9582d67
* | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 7100f8157d -s ours am: ae57e2f654 -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 79ce020c67 -s ours am: f18f6bf9ad -s ours am: f86cc7d2dc -s ours am: b7968ed3e8 -s ours am: 69e9cb123c -s ours Change-Id: Iebd637ceefaa409a39d919f7a03f96f1e55f27af
| * | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 7100f8157d -s ours am: ae57e2f654 -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 79ce020c67 -s ours am: f18f6bf9ad -s ours am: f86cc7d2dc -s ours am: b7968ed3e8 -s ours Change-Id: If279d0b49cd378f42691e2b90fb5d4836466046d
| | * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 7100f8157d -s ours am: ae57e2f654 -s ↵Bill Yi2016-08-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 79ce020c67 -s ours am: f18f6bf9ad -s ours am: f86cc7d2dc -s ours Change-Id: Ib78aeb7f2b685b5040ade3b3d0819303e26b6b2a
| | | * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 7100f8157d -s ours am: ae57e2f654 -s ↵Bill Yi2016-08-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 79ce020c67 -s ours am: f18f6bf9ad -s ours Change-Id: I0ae7d384eacb1591056712c567f9081b2b955269
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 22944c13d2 -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4cb3be1f56 -s ours am: b52b614d95 -s ours am: 1395e1f759 -s ours am: 77abb75410 -s ours am: 2937bff6c3 -s ours am: 93c4cabbca -s ours Change-Id: I7d74080dbbb51f3029ef050d8f145e194d647e46
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 22944c13d2 -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4cb3be1f56 -s ours am: b52b614d95 -s ours am: 1395e1f759 -s ours am: 77abb75410 -s ours am: 2937bff6c3 -s ours Change-Id: Ia7a7e7a18aa23521d171cda6ff5e1ef7bd5bfef1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 22944c13d2 -s ↵Bill Yi2016-08-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4cb3be1f56 -s ours am: b52b614d95 -s ours am: 1395e1f759 -s ours am: 77abb75410 -s ours Change-Id: Ifaf81706f410eb02c53db7c86e364a3cac1db8c4
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 22944c13d2 -s ↵Bill Yi2016-08-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4cb3be1f56 -s ours am: b52b614d95 -s ours am: 1395e1f759 -s ours Change-Id: I46efdd48533e225b16b63135eb59b546a581d650
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: b18162c6f7 -s ours am: 73cc878a0e -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 7173e0f30e -s ours am: 0e19f97dae -s ours am: 5fd4445127 -s ours am: 1fe972ce23 -s ours am: 8e5dae4037 -s ours Change-Id: I7ea75dacf01be109a5ca2c4efe88ccead9573f93
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: b18162c6f7 -s ours am: 73cc878a0e -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 7173e0f30e -s ours am: 0e19f97dae -s ours am: 5fd4445127 -s ours am: 1fe972ce23 -s ours Change-Id: Idb762b80ec5a68bb68e14edafab34085533d9115
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: b18162c6f7 -s ours am: 73cc878a0e -s ↵Bill Yi2016-08-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 7173e0f30e -s ours am: 0e19f97dae -s ours am: 5fd4445127 -s ours Change-Id: I46b92e4eaa85405adbd336548a25c51c16649643
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: b18162c6f7 -s ours am: 73cc878a0e -s ↵Bill Yi2016-08-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 7173e0f30e -s ours am: 0e19f97dae -s ours Change-Id: Iad7d772cf61918489c4fe8dbd1dff8d40d6e8ac9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: dd0a402e3f -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: e4f37ae8f0 -s ours am: 7a93d7e760 -s ours am: 7cb62c3430 -s ours am: 21dc6c49b3 -s ours am: 1de381afca -s ours am: 183f90be89 -s ours Change-Id: I6383441293e9931dd3949d475b3aded6e07fa305
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: dd0a402e3f -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: e4f37ae8f0 -s ours am: 7a93d7e760 -s ours am: 7cb62c3430 -s ours am: 21dc6c49b3 -s ours am: 1de381afca -s ours Change-Id: I6b1712cfbbddd10cd0e917eefd9fb1e059793442
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: dd0a402e3f -s ↵Bill Yi2016-08-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: e4f37ae8f0 -s ours am: 7a93d7e760 -s ours am: 7cb62c3430 -s ours am: 21dc6c49b3 -s ours Change-Id: Ic68c5c29774b9dec93e4564c65dc4feb63dfdb30
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: dd0a402e3f -s ↵Bill Yi2016-08-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: e4f37ae8f0 -s ours am: 7a93d7e760 -s ours am: 7cb62c3430 -s ours Change-Id: I4d45f50664c516b070731927e94e60d05f99dc7f
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: d17b51efaa -s ours am: 2a925946a9 -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 91fa22a23f -s ours am: a79921d014 -s ours am: fd70f3b9b0 -s ours am: c3dba6a908 -s ours am: 5a846cf078 -s ours Change-Id: I06c8644d79054df2cd603833187574558aec1f2d
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: d17b51efaa -s ours am: 2a925946a9 -s ↵Bill Yi2016-08-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 91fa22a23f -s ours am: a79921d014 -s ours am: fd70f3b9b0 -s ours am: c3dba6a908 -s ours Change-Id: I778030b12b0724ce5c50bfe37affef23e86742dd
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: fa0449aca3 -s ↵Bill Yi2016-08-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: fa1885a26c -s ours am: 77c31e3928 -s ours am: 681f54506e -s ours am: 8ce774abec -s ours Change-Id: I38ce913da76c10ae6c6b4cf0d17dc98cd286d65e
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: fa0449aca3 -s ↵Bill Yi2016-08-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: fa1885a26c -s ours am: 77c31e3928 -s ours am: 681f54506e -s ours Change-Id: I31cb15911cd498ea11d96d8ced68af273cfd6e91
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: fa0449aca3 -s ↵Bill Yi2016-08-150-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: fa1885a26c -s ours am: 77c31e3928 -s ours Change-Id: Icb4bef6ee3ab01ad32e3f87a09d3541a441ff7e5
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dev am: fa0449aca3 -s oursBill Yi2016-08-150-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fa1885a26c -s ours Change-Id: I1d35b3e59682539b0a3dab04c6b802498e03662b
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-devBill Yi2016-08-150-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fa0449aca3 -s ours Change-Id: Idad1acd2e39c14ca3aca9c2f95042389161d18ca
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-devTreeHugger Robot2016-08-152-4/+4
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0 -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c1189dba33 -s ours am: 8996236eb1 -s ours am: 2ba5c50524 -s ours am: 1cd94a1294 -s ours am: 0c46f1d530 -s ours am: 0fd1e2fafe -s ours Change-Id: Ic70baefdd079d1cbec89849be81a892de0e2ed3d
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0 -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c1189dba33 -s ours am: 8996236eb1 -s ours am: 2ba5c50524 -s ours am: 1cd94a1294 -s ours am: 0c46f1d530 -s ours Change-Id: I7acb23909c8314b75040d581e8b5837b889f4c2a
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: d17b51efaa -s ours am: 2a925946a9 -s ↵Bill Yi2016-08-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 91fa22a23f -s ours am: a79921d014 -s ours am: fd70f3b9b0 -s ours Change-Id: I5666957449890ad750a2ed522f43a69da0834b80
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: d17b51efaa -s ours am: 2a925946a9 -s ↵Bill Yi2016-08-150-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 91fa22a23f -s ours am: a79921d014 -s ours Change-Id: I3222d85a3061a6f97ab30a3e9478ad035fbdb343
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: d17b51efaa -s ours am: 2a925946a9 -s ↵Bill Yi2016-08-150-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 91fa22a23f -s ours Change-Id: I3c7b3236cb7b7c34d5522f97129f9b2c0b57a489
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: d17b51efaa -s oursBill Yi2016-08-150-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a925946a9 -s ours Change-Id: I138e2b192b4c6d0e05b9eae4f4c3c67a29e80f87
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-08-150-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d17b51efaa -s ours Change-Id: I74451f73b668714b3a87d70deca771ca9acd7b5f
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-08-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbe50b24c32389385f73518106edf82384f2e4e7 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 1a938cfdef -s ours am: 0e29a9ea0a -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: a42d4bbf53 -s ours am: f36dbb6c21 -s ours am: e5ce848c69 -s ours am: abe475ca37 -s ours am: e8561c35ea -s ours Change-Id: I74fbd72e5f3f45804e58241e36bd8da0f924643f
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 1a938cfdef -s ours am: 0e29a9ea0a -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: a42d4bbf53 -s ours am: f36dbb6c21 -s ours am: e5ce848c69 -s ours am: abe475ca37 -s ours Change-Id: Ia662ec7f6efdb1e3fe5523bc1dca0c45b496a07c
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0 -s ↵Bill Yi2016-08-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c1189dba33 -s ours am: 8996236eb1 -s ours am: 2ba5c50524 -s ours am: 1cd94a1294 -s ours Change-Id: I37bee234c157fb99a4255e49c04a8d3468968cef
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0 -s ↵Bill Yi2016-08-150-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c1189dba33 -s ours am: 8996236eb1 -s ours am: 2ba5c50524 -s ours Change-Id: I12eda522204123228d76edd0f319b36c96b512a0
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0 -s ↵Bill Yi2016-08-150-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c1189dba33 -s ours am: 8996236eb1 -s ours Change-Id: I29e3d0bd899b9abbed835105fc12d484b7717b45
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0 -s oursBill Yi2016-08-150-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c1189dba33 -s ours Change-Id: I19402dbaff74cdeaf5ae0c1fb3f80028f8377a9f
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devBill Yi2016-08-150-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d1628307b0 -s ours Change-Id: I73205ca0caf9c6e4979b637edb6a7f73070a14c1
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devTreeHugger Robot2016-08-154-4/+4
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: 64da597a30 -s ↵Bill Yi2016-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: a5726284f6 -s ours am: 736026e759 -s ours am: 9626436be1 -s ours am: 7a58d96597 -s ours am: 5c1f9b239f -s ours am: f019776ab4 -s ours Change-Id: I852d989611236c8d8ab5c27ce7c42f8aa71cc6c7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev am: 64da597a30 -s ↵Bill Yi2016-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: a5726284f6 -s ours am: 736026e759 -s ours am: 9626436be1 -s ours am: 7a58d96597 -s ours am: 5c1f9b239f -s ours Change-Id: I47fee027d01ddef415cdd9cb1bbe3c3403c35db9