Commit Graph

37773 Commits (57adf398a367f5b17a12a959b35dc746b4a11313)

Author SHA1 Message Date
Dan Zivkovic 6f09e99d24 am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
* commit '2bc9f4073d872ac3ffb56e44bef39e24da12a66f':
  Block overflow menu during setup. DO NOT MERGE
2015-03-23 23:10:58 +00:00
Qiwen Zhao 2f7c39d3b7 am 67c06fc2: (-s ours) am c9e43b1d: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit '67c06fc2b85efe221a949ef0fbffa1280efc55ba':
2015-03-23 22:53:02 +00:00
Qiwen Zhao 67c06fc2b8 am c9e43b1d: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit 'c9e43b1dbbefcc5cafea87976e9f6a59163731a0':
2015-03-23 22:43:59 +00:00
Dan Zivkovic 33e959f954 am ffd808b4: We ship with English, so we can\'t unit test French
* commit 'ffd808b4462875a2c15d471dea020f263b833a60':
  We ship with English, so we can't unit test French
2015-03-23 22:19:41 +00:00
Dan Zivkovic 2bc9f4073d Block overflow menu during setup. DO NOT MERGE
Bug 19866981.

Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
(cherry picked from commit 75fc9080a8)
2015-03-23 21:43:52 +00:00
Dan Zivkovic ffd808b446 We ship with English, so we can't unit test French
Change-Id: I20a470a18ca0cd47fe7588958be904eb23fdf1a2
2015-03-23 14:42:10 -07:00
Dan Zivkovic e775215510 am 3e792f61: Minor unit test fixes.
* commit '3e792f61ad702b77cc3c4d6d2887e7475f4ffde6':
  Minor unit test fixes.
2015-03-23 20:38:40 +00:00
Dan Zivkovic 3e792f61ad Minor unit test fixes.
Change-Id: I800bb33a10f31d5b934b00768bc8fe4776e36f90
2015-03-23 13:31:51 -07:00
Jatin Matani c6b279905e am fa296fa6: Merge "Move ManagedProfileUtils to overridable"
* commit 'fa296fa625dcd67e17520c264ed506bb4728e487':
  Move ManagedProfileUtils to overridable
2015-03-23 20:21:10 +00:00
Dan Zivkovic ff27916c42 am e02d4831: Merge "Block overflow menu during setup."
* commit 'e02d4831872e6547af51ce4ef46049281874e324':
  Block overflow menu during setup.
2015-03-23 20:17:25 +00:00
Jatin Matani fa296fa625 Merge "Move ManagedProfileUtils to overridable" 2015-03-23 20:17:13 +00:00
Dan Zivkovic e02d483187 Merge "Block overflow menu during setup." 2015-03-23 20:13:16 +00:00
Jatin Matani cb27c4fe2e Move ManagedProfileUtils to overridable
Bug:19532354
Change-Id: I50b3ae11b6e58f07b482353b624b1a7a73eadc99
2015-03-23 11:57:48 -07:00
Dan Zivkovic 75fc9080a8 Block overflow menu during setup.
Bug 19866981.

Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
2015-03-23 11:34:02 -07:00
Jatin Matani 4bb77f1554 am bc1cf081: Merge "Fix some i18n messaging"
* commit 'bc1cf0817bddceb5dfab81f9ff030fe10eb4a1bc':
  Fix some i18n messaging
2015-03-23 18:26:35 +00:00
Jatin Matani bc1cf0817b Merge "Fix some i18n messaging" 2015-03-23 18:20:49 +00:00
Geoff Mendal 76d0db234e am 13271bfd: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '13271bfde84c56c0bf75868c1a4888c4262b3314':
  Import translations. DO NOT MERGE
2015-03-21 17:00:46 +00:00
Geoff Mendal 56d49ebd5a am 479a7090: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '479a70900d00367691569556a4994ec9ec195f5b':
  Import translations. DO NOT MERGE
2015-03-21 17:00:43 +00:00
Geoff Mendal d4618e4e66 am eb5bbdee: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'eb5bbdee59b99e6290f0c1965a04e472ae72dd04':
  Import translations. DO NOT MERGE
2015-03-21 17:00:41 +00:00
Geoff Mendal 492ef5308f am ed7688c3: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'ed7688c342e070e9b685285e30805b32ab9fc8cf':
  Import translations. DO NOT MERGE
2015-03-21 17:00:38 +00:00
Geoff Mendal bd7c8e0cf9 am 2dfde3be: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '2dfde3bec719f35349ada54660d47c840901f9af':
  Import translations. DO NOT MERGE
2015-03-21 17:00:34 +00:00
Geoff Mendal 5f666283a4 am cef1e8da: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'cef1e8da6bbdf17e22254eac7b8a6cf99fd60ead':
  Import translations. DO NOT MERGE
2015-03-21 17:00:32 +00:00
Geoff Mendal 7825ff954f am f5933bcf: (-s ours) Import translations. DO NOT MERGE
* commit 'f5933bcf42cbbc673235c2f8327ae8904ef881c4':
  Import translations. DO NOT MERGE
2015-03-21 17:00:31 +00:00
Geoff Mendal 13271bfde8 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:57:25 +00:00
Geoff Mendal 772d823ec8 Import translations. DO NOT MERGE
Change-Id: Iff35b6266f1f7249bd4a506f6667fef40eddb530
Auto-generated-cl: translation import
2015-03-20 23:56:44 -07:00
Geoff Mendal 479a70900d Merge "Import translations. DO NOT MERGE" 2015-03-21 06:56:24 +00:00
Geoff Mendal 23c18bba30 Import translations. DO NOT MERGE
Change-Id: Ia8ca67d58e6b3e6325da4f3711aa9dc3a7a1c355
Auto-generated-cl: translation import
2015-03-20 23:55:58 -07:00
Geoff Mendal eb5bbdee59 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:55:18 +00:00
Geoff Mendal 93b18efaac Import translations. DO NOT MERGE
Change-Id: I4ab87513a95932a4c68ee21002a4784d8d577d68
Auto-generated-cl: translation import
2015-03-20 23:54:53 -07:00
Geoff Mendal ed7688c342 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:54:44 +00:00
Geoff Mendal cdda9eac21 Import translations. DO NOT MERGE
Change-Id: Id1e2004e85354dbc48b0bd4104ebc1cf8439161c
Auto-generated-cl: translation import
2015-03-20 23:54:13 -07:00
Geoff Mendal 2dfde3bec7 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:53:35 +00:00
Geoff Mendal aacf1d1494 Import translations. DO NOT MERGE
Change-Id: I256ea01e4447fdf2b485d53706b5e69b50a592a3
Auto-generated-cl: translation import
2015-03-20 23:53:13 -07:00
Geoff Mendal cef1e8da6b Merge "Import translations. DO NOT MERGE" 2015-03-21 06:52:54 +00:00
Geoff Mendal 77d728c4b9 Import translations. DO NOT MERGE
Change-Id: Ibf4c8f681d36736a7e7b1c1568cb688bd15d09bd
Auto-generated-cl: translation import
2015-03-20 23:52:39 -07:00
Geoff Mendal f5933bcf42 Import translations. DO NOT MERGE
Change-Id: I838ad0471c73777e92031acd2713a95378de4535
Auto-generated-cl: translation import
2015-03-20 23:51:57 -07:00
Geoff Mendal 2d79fef93c Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2015-03-21 06:51:53 +00:00
Geoff Mendal fe6a8b1dcf Import translations. DO NOT MERGE
Change-Id: Iceddc06da30422e4a98df45fe01e2e90a4335375
Auto-generated-cl: translation import
2015-03-20 23:51:21 -07:00
Geoff Mendal 81e9721e96 Import translations. DO NOT MERGE
Change-Id: Ie7d8b90ea570a58da67395ed31567daa284739c3
Auto-generated-cl: translation import
2015-03-20 23:50:38 -07:00
Qiwen Zhao c9e43b1dbb reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. 2015-03-20 21:25:25 -07:00
Tadashi G. Takaoka 96a96d0662 am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev
* commit 'c24340f956c16d8594c44d45685f8a814538245b':
2015-03-20 23:30:32 +00:00
Tadashi G. Takaoka bd49b0fd26 am 1073ef97: am 1bb20aa0: am 31544dcb: Add xxxhdpi assets
* commit '1073ef9756617ecd2b4eeddca045039d9e6f3d14':
2015-03-20 23:30:30 +00:00
Yohei Yukawa fbaac52d25 am ead70974: am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the full-screen mode
* commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503':
2015-03-20 23:30:28 +00:00
Tadashi G. Takaoka bdcd606848 am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action key background
* commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b':
2015-03-20 23:30:27 +00:00
Jean Chalard 68c6091715 am beb74610: am ab18b5f1: am 9395014e: Don\'t resume suggestions with H/W keyboard
* commit 'beb746103011149d6dfce10278475946e679263d':
2015-03-20 23:30:25 +00:00
Jean Chalard 116a2565a4 am 61e7afa6: am 0eaa25e0: am 914078fd: Fix a bug where recorrection would stop on connectors
* commit '61e7afa6fa98939f9dcb9f7a2ebb5678a51d4201':
2015-03-20 23:30:23 +00:00
Tadashi G. Takaoka 94b6f21bf6 am 50e8d585: am 56c7ceb4: am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev
* commit '50e8d5854b981b7fbad24fdb9c141ddf39eb904a':
2015-03-20 23:30:22 +00:00
Yohei Yukawa f21fea6017 am 42ddc212: am f930ce12: am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev
* commit '42ddc2127deb117a0bb2b7a7797cb8c9ba335f5a':
2015-03-20 23:30:20 +00:00
Jean Chalard 7e82f99ec6 am c3fac52d: am 1f74ba17: am cb077f75: Merge "Resolve an old TODO." into lmp-dev
* commit 'c3fac52dd51ba70db83d96b2d421bd440683d9bc':
2015-03-20 23:30:18 +00:00
Yohei Yukawa 76f6adb03d am c1ee8857: am a6c53d31: am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev
* commit 'c1ee88572232235d5972220ec1e5232de58a916e':
2015-03-20 23:30:14 +00:00