tree 099f505c1e64ff021c263511106783f3bdbc5f8e
parent b8a581a9d8873582c108a8cb9145ed7d3fa2605a
author Filipe Gonçalves <filipe@kwamecorp.com> 1464698246 +0100
committer Filipe Gonçalves <filipe@kwamecorp.com> 1464698246 +0100

FP2-1993: Calculator: Integrate latest AOSP fixes and improvements

commit b7a85d0cc708d2d6523b1df2a20bbd29c4e3b1fa
    Merge remote-tracking branch 'aosp/marshmallow-mr2-release' into HEAD
commit ae4f6218f9cdc96eb3583d4b9c86c2b519976ace
    Import translations. DO NOT MERGE
commit 944ee8a700b5a2786b1eec9466fa0c12f5f540a8
    am f5766c04: (-s ours) Import translations. DO NOT MERGE
    * commit 'f5766c04c3c23711f7cbfaebf75d210924013b97':
      Import translations. DO NOT MERGE
commit f5766c04c3c23711f7cbfaebf75d210924013b97
    Import translations. DO NOT MERGE
commit 717e03bd0650331cb6fc4adf763dde0581a51ad4
    Import translations. DO NOT MERGE
commit 76c3a31ee640efc4fa4a7141f204da0f081cbf76
    Import translations. DO NOT MERGE
commit d7f602577ee1c47d2c7eb280977039eb03cce0e4
    Import translations. DO NOT MERGE
commit d2d8c5de065199e177ef6dd0d1b5a9211c974d96
    am f71e5871: (-s ours) Import translations. DO NOT MERGE
    * commit 'f71e5871abc77495040e79a543cc93d66461284f':
      Import translations. DO NOT MERGE
commit 5a88d0f28e73bdff6642483ff662a6467d9b95d8
    Import translations. DO NOT MERGE
commit f71e5871abc77495040e79a543cc93d66461284f
    Import translations. DO NOT MERGE
commit a0198d00d553b594577bbfa952a330a35ca50d37
    am 22ef6477: am 17bb4d3d: Merge "Replace the use of manually translated digits in Calculator."
    * commit '22ef6477d8033cab3bc06e1e64e237a505660240':
      Replace the use of manually translated digits in Calculator.
commit 22ef6477d8033cab3bc06e1e64e237a505660240
    am 17bb4d3d: Merge "Replace the use of manually translated digits in Calculator."
    * commit '17bb4d3d9ca000ae66cacb9ece4979d50fcb2403':
      Replace the use of manually translated digits in Calculator.
commit 17bb4d3d9ca000ae66cacb9ece4979d50fcb2403
    Merge "Replace the use of manually translated digits in Calculator."
commit 411fc19c8c60651ba75b2ea7aedd8e1b82e52d29
    Replace the use of manually translated digits in Calculator.
    ICU knows better, so use it. This change preserves the existing policy
    that all languages except farsi get latin numerals.
commit 8c179606d61de31c5164f7143215398ef3ebbdbf
    Import translations. DO NOT MERGE
commit 3d98bce6fcdc3311449cb13f2361d7e0874a58f8
    am 44e65c3b: (-s ours) am f7ff30be: (-s ours) Import translations. DO NOT MERGE
    * commit '44e65c3b12d47f4bcf6ba43fc2e976abcf3cb756':
      Import translations. DO NOT MERGE
commit 44e65c3b12d47f4bcf6ba43fc2e976abcf3cb756
    am f7ff30be: (-s ours) Import translations. DO NOT MERGE
    * commit 'f7ff30be539094fce515be10a612b04475d3016e':
      Import translations. DO NOT MERGE
commit f7ff30be539094fce515be10a612b04475d3016e
    Import translations. DO NOT MERGE
commit 49939ee19ca7c34f9e54c6d8ab37b46521d2118a
    am 9fdbe43b: (-s ours) am 36f80863: (-s ours) Import translations. DO NOT MERGE
    * commit '9fdbe43b1eb0dc684c2179be35bf145a540a58d3':
      Import translations. DO NOT MERGE
commit 9fdbe43b1eb0dc684c2179be35bf145a540a58d3
    am 36f80863: (-s ours) Import translations. DO NOT MERGE
    * commit '36f80863325e759cad038c0d9940aa1dd36281d0':
      Import translations. DO NOT MERGE
commit 36f80863325e759cad038c0d9940aa1dd36281d0
    Import translations. DO NOT MERGE
commit 780df1306cae7f1ffacaa7701bb97ea9077e0ad7
    Import translations. DO NOT MERGE
commit 995e2b46249e13d4d8f3d98df2ddc70831413d51
    am 75124fba: am 2320c8ac: am 1283ee74: Stop using RenderNodeAnimator callbacks
    * commit '75124fbaf11aa849721f314a04f7effbe18de662':
      Stop using RenderNodeAnimator callbacks
commit 433db7999be2d26e1e6ac6e809b8436b51976339
    am d61b039d: am 8f27d2a4: am e61089e5: Increase number of guard digits
    * commit 'd61b039d67720ac522ca0cf40d738baee3cfc326':
      Increase number of guard digits
commit 75124fbaf11aa849721f314a04f7effbe18de662
    am 2320c8ac: am 1283ee74: Stop using RenderNodeAnimator callbacks
    * commit '2320c8ac44e6851c76c233426fa6848906eaf38a':
      Stop using RenderNodeAnimator callbacks
commit d61b039d67720ac522ca0cf40d738baee3cfc326
    am 8f27d2a4: am e61089e5: Increase number of guard digits
    * commit '8f27d2a402c9bd909d8f851e8ae323ba427f0f13':
      Increase number of guard digits
commit 850aef735a47e454109a49849b64cfb86f05b82b
    Import translations. DO NOT MERGE
commit 2320c8ac44e6851c76c233426fa6848906eaf38a
    am 1283ee74: Stop using RenderNodeAnimator callbacks
    * commit '1283ee748254cce69fda2d1a3d2af1cf881b2738':
      Stop using RenderNodeAnimator callbacks
commit 8f27d2a402c9bd909d8f851e8ae323ba427f0f13
    am e61089e5: Increase number of guard digits
    * commit 'e61089e594fb1718376926c515a1e6b594a865cf':
      Increase number of guard digits
commit a22049786043e843cb794873ad7a6891a4234a01
    am 4785ba54: (-s ours) am 7bfa5f75: (-s ours) am 0ba5a499: (-s ours) Import translations. DO NOT MERGE
    * commit '4785ba546595612f7889f5cc02d4c7351bec47ee':
      Import translations. DO NOT MERGE
commit 4785ba546595612f7889f5cc02d4c7351bec47ee
    am 7bfa5f75: (-s ours) am 0ba5a499: (-s ours) Import translations. DO NOT MERGE
    * commit '7bfa5f75d635d81bb161a688ec757f1fe1b93f87':
      Import translations. DO NOT MERGE
commit 516d03a9a51c50dc5168f19e07845c312cf065e1
    Import translations. DO NOT MERGE
commit 7bfa5f75d635d81bb161a688ec757f1fe1b93f87
    am 0ba5a499: (-s ours) Import translations. DO NOT MERGE
    * commit '0ba5a4998cd7612c762fa51cf67c13892c44584b':
      Import translations. DO NOT MERGE
commit 2d5303e87e3b7f23f626ca1fe32045352d96aea4
    Import translations. DO NOT MERGE
commit acfb6d89adcd468eea72a2896da85d1e82c7f2ea
    Import translations. DO NOT MERGE
commit bfb7cd2f512b0313e21d010aeef3e2b1f3d6a219
    am 5267d8ae: (-s ours) am 2d4b4587: (-s ours) Import translations. DO NOT MERGE
    * commit '5267d8ae92f16b275f61e1e20bbcc8e9c48d5613':
      Import translations. DO NOT MERGE
commit 5267d8ae92f16b275f61e1e20bbcc8e9c48d5613
    am 2d4b4587: (-s ours) Import translations. DO NOT MERGE
    * commit '2d4b45870ca51ea75e2ed4389d32a5f9f4ed1e7f':
      Import translations. DO NOT MERGE
commit 2d4b45870ca51ea75e2ed4389d32a5f9f4ed1e7f
    Import translations. DO NOT MERGE
commit 28dfe21565eb26003f7e114a8216b7749fa0f737
    am aceaefab: (-s ours) am 39afedaa: (-s ours) am e00d8cb7: (-s ours) Import translations. DO NOT MERGE
    * commit 'aceaefab67ac84ea4a35493ad3ffc0fb4c9bd9bb':
commit cbf6836682f49a1e012b158c85b547023db68472
    am c875a1b5: am 9c04e649: am 2db2d95b: am ab6fb4ac: Adjust text colors for GAR constrast requirements
    * commit 'c875a1b5996f2bf223358ad3ac180d2b66bf0e20':
commit aceaefab67ac84ea4a35493ad3ffc0fb4c9bd9bb
    am 39afedaa: (-s ours) am e00d8cb7: (-s ours) Import translations. DO NOT MERGE
    * commit '39afedaaac311762aecbcec2bd88a5da33605cb9':
commit c875a1b5996f2bf223358ad3ac180d2b66bf0e20
    am 9c04e649: am 2db2d95b: am ab6fb4ac: Adjust text colors for GAR constrast requirements
    * commit '9c04e6490ce9b2e6b37fc59410d5948a2692b691':
commit 1ce42d04f2873db2a4b17fb7e9d52c63e2f1217a
    Import translations. DO NOT MERGE
commit 485c9fb5dd399dbc7ebea7673caab1c2df371da7
    Import translations. DO NOT MERGE
commit 98078b2758f3c7124db8ec35c268612a036028a1
    Merge "Import translations. DO NOT MERGE"
commit c6c5ba203ed84a040e32ca79f4550d9263e5385f
    am 5ce419fa: (-s ours) am 2b885f28: (-s ours) am c27cb75d: (-s ours) am 3dacba4a: (-s ours) am e00d8cb7: (-s ours) Import translations. DO NOT MERGE
    * commit '5ce419faf1b44e52a3b1a44fb654d4ac0d2dd7be':
      Import translations. DO NOT MERGE
commit 5ce419faf1b44e52a3b1a44fb654d4ac0d2dd7be
    am 2b885f28: (-s ours) am c27cb75d: (-s ours) am 3dacba4a: (-s ours) am e00d8cb7: (-s ours) Import translations. DO NOT MERGE
    * commit '2b885f2810f1d0c335e5fa49d05b05a2fbcc3940':
      Import translations. DO NOT MERGE
commit 2b885f2810f1d0c335e5fa49d05b05a2fbcc3940
    am c27cb75d: (-s ours) am 3dacba4a: (-s ours) am e00d8cb7: (-s ours) Import translations. DO NOT MERGE
    * commit 'c27cb75d14131ef0c7d160f52d51cf48c749dae0':
      Import translations. DO NOT MERGE
commit cd6d6a81c76fe5f18b3953059a5f12d9efb75bfa
    Import translations. DO NOT MERGE
commit 39afedaaac311762aecbcec2bd88a5da33605cb9
    am e00d8cb7: (-s ours) Import translations. DO NOT MERGE
    * commit 'e00d8cb73cc4ec9a1ef813b2cc34c31afbf2f0ab':
      Import translations. DO NOT MERGE
commit 68c0039fe5287f51803ee5e271478a43563dcbe7
    am fb75dd42: am ab6fb4ac: Adjust text colors for GAR constrast requirements
    * commit 'fb75dd4237a4195396bab640ef1e1e6a24a906ff':
commit fb75dd4237a4195396bab640ef1e1e6a24a906ff
    am ab6fb4ac: Adjust text colors for GAR constrast requirements
    * commit 'ab6fb4acb9d6a3b769743e6b10c5e3b21ed1c52e':
      Adjust text colors for GAR constrast requirements
commit cd25a9caacdc37391f39041375b2331faebc17d9
    am 9c04e649: am 2db2d95b: am ab6fb4ac: Adjust text colors for GAR constrast requirements
    * commit '9c04e6490ce9b2e6b37fc59410d5948a2692b691':
      Adjust text colors for GAR constrast requirements
commit 9c04e6490ce9b2e6b37fc59410d5948a2692b691
    am 2db2d95b: am ab6fb4ac: Adjust text colors for GAR constrast requirements
    * commit '2db2d95b797d04795cef580653c6b74889b1aa2f':
      Adjust text colors for GAR constrast requirements
commit 2db2d95b797d04795cef580653c6b74889b1aa2f
    am ab6fb4ac: Adjust text colors for GAR constrast requirements
    * commit 'ab6fb4acb9d6a3b769743e6b10c5e3b21ed1c52e':
      Adjust text colors for GAR constrast requirements
commit dd78324be040ee6998f2534ccb12e76e70e3dbeb
    am a1680f55: am f5d2a6ed: am acfc688f: Update display metrics for 7" tablets
    * commit 'a1680f55dd126cef7eb3812aa4e0482378aaa75c':
      Update display metrics for 7" tablets
commit a1680f55dd126cef7eb3812aa4e0482378aaa75c
    am f5d2a6ed: am acfc688f: Update display metrics for 7" tablets
    * commit 'f5d2a6eddd14cad84ce8a48523573b2889d85427':
      Update display metrics for 7" tablets
commit f5d2a6eddd14cad84ce8a48523573b2889d85427
    am acfc688f: Update display metrics for 7" tablets
    * commit 'acfc688f7b0d107fff73d594b1372a0da662aa4a':
      Update display metrics for 7" tablets
commit ceb2690900b579baad2a444221cb2830d3669084
    am f61ee962: am 09532fec: am 06360f92: Add reveal view to overlay before creating animator
    * commit 'f61ee962ffc2d0d288191fa6f5e6f60246d77d96':
      Add reveal view to overlay before creating animator
commit f61ee962ffc2d0d288191fa6f5e6f60246d77d96
    am 09532fec: am 06360f92: Add reveal view to overlay before creating animator
    * commit '09532fec3ae70ec185ede78182c51a07144c66e0':
      Add reveal view to overlay before creating animator
commit 09532fec3ae70ec185ede78182c51a07144c66e0
    am 06360f92: Add reveal view to overlay before creating animator
    * commit '06360f9211fc2c6df4c5749bebb65202e1bb12a8':
      Add reveal view to overlay before creating animator
commit e2b324a60c97ea9f517e71b8c0b73bc52ae86b33
    am 8507f865: am 58314612: am bfc4e4d8: Improve hardware keyboard support
    * commit '8507f86593cf8987c3fd32775dbed0c1b0ef7fae':
      Improve hardware keyboard support
commit 8507f86593cf8987c3fd32775dbed0c1b0ef7fae
    am 58314612: am bfc4e4d8: Improve hardware keyboard support
    * commit '58314612565fcaa7f564d1bcd4ea9950b4b4e6b6':
      Improve hardware keyboard support
commit 58314612565fcaa7f564d1bcd4ea9950b4b4e6b6
    am bfc4e4d8: Improve hardware keyboard support
    * commit 'bfc4e4d88011b33b4cf142a89b9125bd07393ab5':
      Improve hardware keyboard support
commit 5dddfeb0ecd26d9f204cb9a7dfc0bf5d1e620a5a
    Merge "Import translations. DO NOT MERGE"
commit 4314d17c6810957ca78ceab4d4a3f55904fa1154
    am 7c3fc128: am 2c82a585: am f79d6f69: Fix NPE resulting from invalid instance state
    * commit '7c3fc128913ae22b15478c086c07b36aa7fd51e6':
      Fix NPE resulting from invalid instance state
commit 7c3fc128913ae22b15478c086c07b36aa7fd51e6
    am 2c82a585: am f79d6f69: Fix NPE resulting from invalid instance state
    * commit '2c82a58551dabc42238466db29eae5e1ddfdc3de':
      Fix NPE resulting from invalid instance state
commit 2c82a58551dabc42238466db29eae5e1ddfdc3de
    am f79d6f69: Fix NPE resulting from invalid instance state
    * commit 'f79d6f699b04a735e1627b47a059760ff40c26b9':
      Fix NPE resulting from invalid instance state
commit cdb19abffa290e5d7e0b297e92284631863e5e6d
    Import translations. DO NOT MERGE
commit 4ed497a30d75561201b86ba5d3fcdbfdb7fb6ca2
    am 1d9261df: (-s ours) am 41898f44: (-s ours) am 3ff6d06b: (-s ours) am 47358b6a: (-s ours) am 2637bc51: (-s ours) Import translations. DO NOT MERGE
    * commit '1d9261df10e296888f5b55ed984e6ebb6c28cb62':
      Import translations. DO NOT MERGE
commit 1d9261df10e296888f5b55ed984e6ebb6c28cb62
    am 41898f44: (-s ours) am 3ff6d06b: (-s ours) am 47358b6a: (-s ours) am 2637bc51: (-s ours) Import translations. DO NOT MERGE
    * commit '41898f44fdc3ed435c9b264c6b88c9ae7dd5ada5':
      Import translations. DO NOT MERGE
commit 41898f44fdc3ed435c9b264c6b88c9ae7dd5ada5
    am 3ff6d06b: (-s ours) am 47358b6a: (-s ours) am 2637bc51: (-s ours) Import translations. DO NOT MERGE
    * commit '3ff6d06b51ed639535d61fa77c5dba4310e60ec7':
      Import translations. DO NOT MERGE
commit 0da628e2bf069cd474e546a9cc2b116eb8016326
    am ebc61fbe: (-s ours) am 3a0a60b6: (-s ours) am 5a849071: (-s ours) Import translations. DO NOT MERGE
    * commit 'ebc61fbe271954767b6913e3f75b0dc921fd638b':
      Import translations. DO NOT MERGE
commit ebc61fbe271954767b6913e3f75b0dc921fd638b
    am 3a0a60b6: (-s ours) am 5a849071: (-s ours) Import translations. DO NOT MERGE
    * commit '3a0a60b6b73380aa083a28f1be0f4552ce9749cf':
      Import translations. DO NOT MERGE
commit 3a0a60b6b73380aa083a28f1be0f4552ce9749cf
    am 5a849071: (-s ours) Import translations. DO NOT MERGE
    * commit '5a8490719d88eb33396be940d584d3700ab5630d':
      Import translations. DO NOT MERGE
commit ac635edfe8fb0bde684a48a3602144f45c1527cc
    Import translations. DO NOT MERGE
commit 36ccaf89663358f99a2559d07ec15aef59416f08
    am bf604f28: (-s ours) am bb10598e: (-s ours) am d9b329ba: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
    * commit 'bf604f28529a8d08730721e4e0452f142e3d2bec':
      Import translations. DO NOT MERGE
commit bf604f28529a8d08730721e4e0452f142e3d2bec
    am bb10598e: (-s ours) am d9b329ba: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
    * commit 'bb10598e0adf417a319d0e854faa8212090c4842':
      Import translations. DO NOT MERGE
commit bb10598e0adf417a319d0e854faa8212090c4842
    am d9b329ba: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
    * commit 'd9b329ba1d82014d04484cd31958b733e3ba92c8':
      Import translations. DO NOT MERGE
commit 934ab0617ae8fe743fe4ffea5eac71690afb68da
    am 239204a1: (-s ours) am 758853c4: (-s ours) am 02cb9e79: (-s ours) am c029b460: (-s ours) am 8462ebf7: (-s ours) Import translations. DO NOT MERGE
    * commit '239204a1a124c66d3465e2fd44a60c776a62123d':
      Import translations. DO NOT MERGE
commit 239204a1a124c66d3465e2fd44a60c776a62123d
    am 758853c4: (-s ours) am 02cb9e79: (-s ours) am c029b460: (-s ours) am 8462ebf7: (-s ours) Import translations. DO NOT MERGE
    * commit '758853c43e42c12602aa86fff9915266f5b7bb3e':
      Import translations. DO NOT MERGE
commit 758853c43e42c12602aa86fff9915266f5b7bb3e
    am 02cb9e79: (-s ours) am c029b460: (-s ours) am 8462ebf7: (-s ours) Import translations. DO NOT MERGE
    * commit '02cb9e7998b3badd680bcc48a25de9ff1f9e08a7':
      Import translations. DO NOT MERGE
commit fb2796ace39d39bebc3faa2c730ec87bf03186b7
    am b32faf8b: am 2de5fdbf: am fa96bda2: Update launcher icon to quantum asset
    * commit 'b32faf8b8edbe549243b49e2a5f1d6298a86592e':
      Update launcher icon to quantum asset
commit b32faf8b8edbe549243b49e2a5f1d6298a86592e
    am 2de5fdbf: am fa96bda2: Update launcher icon to quantum asset
    * commit '2de5fdbf6749b06cdd5a8ab52e83a20517e074e6':
      Update launcher icon to quantum asset
commit 2de5fdbf6749b06cdd5a8ab52e83a20517e074e6
    am fa96bda2: Update launcher icon to quantum asset
    * commit 'fa96bda2f6b7bfe76d6fd05261dcb65ba2fe515b':
      Update launcher icon to quantum asset
commit 3778319b50927db053616861c69196a026542f00
    am 9c8a3eb1: am 37979aa3: am ee70eb2c: Merge "Add basic support to handle hardware keyboard" into lmp-dev
    * commit '9c8a3eb19ab1e1d166fe4705d4d61d7767d1bf0d':
      Add basic support to handle hardware keyboard
commit 3ca2058bcd26bf4be76d5b52bdcc58777b5fc964
    am 07de87c5: am 42d7e508: am 75649ef3: Polish pad ripple colors
    * commit '07de87c56ed09509ee746aef0a01492788f9fe30':
      Polish pad ripple colors
commit 9c8a3eb19ab1e1d166fe4705d4d61d7767d1bf0d
    am 37979aa3: am ee70eb2c: Merge "Add basic support to handle hardware keyboard" into lmp-dev
    * commit '37979aa33c3897fc4b65cf68eda725dc9e27c8fe':
      Add basic support to handle hardware keyboard
commit 07de87c56ed09509ee746aef0a01492788f9fe30
    am 42d7e508: am 75649ef3: Polish pad ripple colors
    * commit '42d7e508c9e95545550352e632a3afdc1081042a':
      Polish pad ripple colors
commit 37979aa33c3897fc4b65cf68eda725dc9e27c8fe
    am ee70eb2c: Merge "Add basic support to handle hardware keyboard" into lmp-dev
    * commit 'ee70eb2c0fdcd61da0b5fe7fdcbef81ce8496bbd':
      Add basic support to handle hardware keyboard
commit 42d7e508c9e95545550352e632a3afdc1081042a
    am 75649ef3: Polish pad ripple colors
    * commit '75649ef3d8ca217ce93859bb8d60187b3405f4e1':
      Polish pad ripple colors
commit ae139992ee1be891911c7c140e76f5315fb18f46
    Import translations. DO NOT MERGE
commit 7a95907b4d93b32f6dd7f4eee7108e190be17562
    am fc68c53a: am 644c3692: am 06ef8195: Disable calculator pad overscroll
    * commit 'fc68c53a3aa7ce47c68d569153cd6a354ff9503d':
      Disable calculator pad overscroll
commit fc68c53a3aa7ce47c68d569153cd6a354ff9503d
    am 644c3692: am 06ef8195: Disable calculator pad overscroll
    * commit '644c3692621682ed04312d32ac38c9686dee87d7':
      Disable calculator pad overscroll
commit 644c3692621682ed04312d32ac38c9686dee87d7
    am 06ef8195: Disable calculator pad overscroll
    * commit '06ef8195ea836ebc3db17d1a570d077ed7d75de1':
      Disable calculator pad overscroll
commit 3fee8a576134853a5916a9f587859d1638168d97
    am c60f6456: am dc869669: am 2be4fdbf: Preserve/restore calculator instance state
    * commit 'c60f6456a6d906813ae8750ca1b21df2426996e2':
      Preserve/restore calculator instance state
commit c60f6456a6d906813ae8750ca1b21df2426996e2
    am dc869669: am 2be4fdbf: Preserve/restore calculator instance state
    * commit 'dc869669713dfcc6369b8fe44817157c11afcca9':
      Preserve/restore calculator instance state
commit dc869669713dfcc6369b8fe44817157c11afcca9
    am 2be4fdbf: Preserve/restore calculator instance state
    * commit '2be4fdbfcd5f16bc12066d1ccac181bca3dfaa7a':
      Preserve/restore calculator instance state
commit df742c9fd2aa0aad9b1a244a505a014d15c56e3a
    am b7767290: am 89bff080: am bf3ad49a: Center operation buttons on phone portrait
    * commit 'b7767290ca979ab200643c5f176f9a4eb5aea348':
      Center operation buttons on phone portrait
commit b7767290ca979ab200643c5f176f9a4eb5aea348
    am 89bff080: am bf3ad49a: Center operation buttons on phone portrait
    * commit '89bff080839ad68e43dd429357cc3e1c45d0b7a4':
      Center operation buttons on phone portrait
commit 89bff080839ad68e43dd429357cc3e1c45d0b7a4
    am bf3ad49a: Center operation buttons on phone portrait
    * commit 'bf3ad49a16d027b7e584789e444d6b0b73945a2d':
      Center operation buttons on phone portrait
commit bd67537b6bfb52328170933ea570adba73b2fda1
    Import translations. DO NOT MERGE
commit 5d1e8b7ee7c581f694f5e0b64d3baef7c18fe93d
    am 754dc6fe: am 32a92277: am bbb595a5: Add acknowledgement for arity per Apache license req
    * commit '754dc6feb7b04d2eb48aa38eb6d1ebd10265ed35':
      Add acknowledgement for arity per Apache license req
commit 754dc6feb7b04d2eb48aa38eb6d1ebd10265ed35
    am 32a92277: am bbb595a5: Add acknowledgement for arity per Apache license req
    * commit '32a92277c021616d858d9be66b31c14ad13d68de':
      Add acknowledgement for arity per Apache license req
commit 32a92277c021616d858d9be66b31c14ad13d68de
    am bbb595a5: Add acknowledgement for arity per Apache license req
    * commit 'bbb595a516eabe022c1ad4df6162582a9cde866f':
      Add acknowledgement for arity per Apache license req
commit 06beab874939a4a7723e47979fc2fdc6219257a5
    am 1137b572: am 5388cb5e: Remove deprecated locales - DO NOT MERGE
    * commit '1137b5724b95caab1b91368a8957d8fffeaf004e':
      Remove deprecated locales - DO NOT MERGE
commit 1137b5724b95caab1b91368a8957d8fffeaf004e
    am 5388cb5e: Remove deprecated locales - DO NOT MERGE
    * commit '5388cb5e25786db3a82dba936fae4f9c856a2ca1':
      Remove deprecated locales - DO NOT MERGE
commit da65427222276b69685502463eb5494f44c9895b
    Merge "Import translations. DO NOT MERGE"
commit 2f25b60c039ffe3111c239bab2a63c2fe324217f
    am 06beab87: (-s ours) am 1137b572: am 5388cb5e: Remove deprecated locales - DO NOT MERGE
    * commit '06beab874939a4a7723e47979fc2fdc6219257a5':
      Remove deprecated locales - DO NOT MERGE
commit 71f990f76fc4325d2a9f25667e2b8f21106c9068
    Import translations. DO NOT MERGE
commit d859b07920f35018d9a8da9f2fb40e2aeb1c962e
    Remove deprecated locales
commit ef2077c04b7f5e68eb2555d03fbcc292cc66bfef
    Remove deprecated locales
commit 218f831475fa7ed7bde66410ca61e7d9a1b20c64
    am 2797a6d5: (-s ours) am c5b96605: (-s ours) am 94816967: (-s ours) Import translations. DO NOT MERGE
    * commit '2797a6d526dad74e29c1f09af07c05cd84599c93':
commit cde040258d892b30fccbcabeb680ce608d3b9b86
    am c5b96605: (-s ours) am 94816967: (-s ours) Import translations. DO NOT MERGE
    * commit 'c5b966052888e57cc637aa49a07655cb90f506c5':
      Import translations. DO NOT MERGE
commit 2797a6d526dad74e29c1f09af07c05cd84599c93
    am c5b96605: (-s ours) am 94816967: (-s ours) Import translations. DO NOT MERGE
    * commit 'c5b966052888e57cc637aa49a07655cb90f506c5':
      Import translations. DO NOT MERGE
commit c5b966052888e57cc637aa49a07655cb90f506c5
    am 94816967: (-s ours) Import translations. DO NOT MERGE
    * commit '94816967b903e82cd88d13da26a9301efbe55aa1':
      Import translations. DO NOT MERGE

Change-Id: Ie01422b2cef437d8c394e916d0ea1e3793460988