Ruben Brunk
63c8e126e7
Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
2014-09-24 17:54:18 +00:00
Baligh Uddin
4149138abf
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-24 17:49:37 +00:00
Baligh Uddin
a9ec2ea832
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-09-24 17:49:36 +00:00
Baligh Uddin
e9cc776346
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-09-24 17:49:25 +00:00
Baligh Uddin
da1e729297
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-24 17:49:14 +00:00
Dianne Hackborn
f31f1d5b79
am 9727cd7f: am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804 : Add resource padding" into lmp-dev
...
* commit '9727cd7f20fdb0f5037857b2567609e33b040897':
Fix issue #17632804 : Add resource padding
2014-09-24 17:46:00 +00:00
Robin Lee
63c8c85e24
am 1e1c2822: am 9b1fea82: am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev
...
* commit '1e1c282208caa930529ec3fc2f21e3470cd66b42':
Reset keystore when user is added or removed
2014-09-24 17:45:51 +00:00
Baligh Uddin
59c8cee55f
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-24 17:44:04 +00:00
Baligh Uddin
91a32a05ff
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-09-24 17:44:02 +00:00
Baligh Uddin
af60ac6984
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-09-24 17:44:02 +00:00
Baligh Uddin
1d51b534b0
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-24 17:43:58 +00:00
Ruben Brunk
0fd198ad89
camera2: Hide JPEGs in RGBA gralloc buffers.
...
Bug: 17379185
- WAR for SW Write usage flags being unavailable on
certain devices for JPEG (blob) format buffers.
Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
2014-09-24 10:43:12 -07:00
Dianne Hackborn
3756b414de
am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804 : Add resource padding" into lmp-dev
...
* commit '98769dc2d46b020e64961b73567d5731d404d0dd':
Fix issue #17632804 : Add resource padding
2014-09-24 17:37:05 +00:00
Robin Lee
ec16ecc68a
am 9b1fea82: am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev
...
* commit '9b1fea82c7ed98b8189a61c37796e37631c923a1':
Reset keystore when user is added or removed
2014-09-24 17:32:34 +00:00
Adrian Roos
bb25830886
am f3cd66e1: am fe660c17: am 060dd970: am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev
...
* commit 'f3cd66e11359885980c6f2a16f6e0705bbdf5500':
Fix ColorInversionTile for secondary users
2014-09-24 17:30:17 +00:00
Dianne Hackborn
e3185cba6d
am c0e5eb2b: Merge "Fix issue #17632804 : Add resource padding" into lmp-dev
...
* commit 'c0e5eb2b4310b14bbf1829ce4516084462e9cf8b':
Fix issue #17632804 : Add resource padding
2014-09-24 17:30:02 +00:00
Adrian Roos
dba31c4cab
am fe660c17: am 060dd970: am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev
...
* commit 'fe660c1788a1cacb070f6bda0a352bfcd4ffe34b':
Fix ColorInversionTile for secondary users
2014-09-24 17:23:22 +00:00
Robin Lee
9686582f4f
am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev
...
* commit '0a803fcc2a000985a42072db5b4c9d4917139fcf':
Reset keystore when user is added or removed
2014-09-24 17:20:26 +00:00
Dianne Hackborn
b1aed18d9b
Merge "Fix issue #17632804 : Add resource padding" into lmp-dev
2014-09-24 17:17:40 +00:00
Adrian Roos
00f484f970
am 060dd970: am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev
...
* commit '060dd970e09a3474174250f2e7cd0611d01815ba':
Fix ColorInversionTile for secondary users
2014-09-24 17:11:37 +00:00
Bill Yi
017e87b624
am 6471a6fa: (-s ours) am 1829a4b4: (-s ours) Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE"
...
* commit '6471a6faf5289fbd697548eddccf45b6e43148cc':
Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE
2014-09-24 17:11:05 +00:00
Robin Lee
de3c3f6f1d
Merge "Reset keystore when user is added or removed" into lmp-dev
2014-09-24 17:03:33 +00:00
Adrian Roos
500d0714e9
am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev
...
* commit '291d6e0f59f479b8d451293e72a7a834a8cf375d':
Fix ColorInversionTile for secondary users
2014-09-24 16:59:10 +00:00
Bill Yi
6471a6faf5
am 1829a4b4: (-s ours) Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE"
...
* commit '1829a4b4d16e1bf37650e34ad6bbc54b68145e15':
Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE
2014-09-24 16:57:52 +00:00
Bill Yi
1829a4b4d1
Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE"
2014-09-24 16:46:41 +00:00
Adrian Roos
895db8525b
Merge "Fix ColorInversionTile for secondary users" into lmp-dev
2014-09-24 16:46:21 +00:00
RoboErik
23b113592a
Clear the volume cache for all inactive state transitions
...
bug:16988480
Change-Id: I0426c76681f8ec832c3f72842ee494d286050fea
2014-09-24 09:36:17 -07:00
Svetoslav
eaf576b0b0
am cbcb9786: am 5d554082: am 1f859a83: am 15c86a84: Merge "Missing pages in print preview when scorolling." into lmp-dev
...
* commit 'cbcb97862c9122a02811f58865679f0ea7ce1e7c':
Missing pages in print preview when scorolling.
2014-09-24 16:20:50 +00:00
Svetoslav
5948a3c967
am 0444464b: am 8b5f8df1: am 3ee4d02c: am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
...
* commit '0444464b18cd9dcb070e5a5e12192a000b07b0a4':
Ignore not visible views computing click point for accessibility.
2014-09-24 16:20:45 +00:00
Jason Monk
a2cbb29774
am 5a662bca: am b667c05d: am e4465aea: am f40f4af6: Merge "Add announcement of global actions dialog" into lmp-dev
...
* commit '5a662bcac6c47dbea80b3cbef350d7dc6b922d11':
Add announcement of global actions dialog
2014-09-24 16:20:37 +00:00
Jason Monk
7fec638e35
am 52a03e34: am b5703c37: am e0000160: am c631f962: Merge "Fix accessibility announcement for QS details" into lmp-dev
...
* commit '52a03e34abd08e55b08c745a32e9a8afbeebebd5':
Fix accessibility announcement for QS details
2014-09-24 16:20:28 +00:00
Zoltan Szatmary-Ban
f168023d82
am 5ba8cb8a: am 209c42d1: am eae7e276: am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
...
* commit '5ba8cb8aaafd3ffc8686687eee411f5f7b4e377f':
Register ActivityManagerService.PackageMonitor for all users.
2014-09-24 16:20:17 +00:00
Bill Yi
519c1f6433
Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE
...
Change-Id: I30305a3f821b4f75f5037ebf11b74cfb8f2c8bb2
2014-09-24 09:17:57 -07:00
Svetoslav
c1c872330c
am 5d554082: am 1f859a83: am 15c86a84: Merge "Missing pages in print preview when scorolling." into lmp-dev
...
* commit '5d554082481a2bdeaa5ec12974c659054ff41187':
Missing pages in print preview when scorolling.
2014-09-24 15:56:52 +00:00
Svetoslav
b66a3e2bde
am 8b5f8df1: am 3ee4d02c: am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
...
* commit '8b5f8df13eb42cff80751f1ad19e7778a12db110':
Ignore not visible views computing click point for accessibility.
2014-09-24 15:56:48 +00:00
Joe Fernandez
2c1ef5328c
am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
...
* commit '1968b91937020e8aa826224642733bbb9055af2e':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
2014-09-24 15:56:02 +00:00
Svetoslav
1b172451bb
am 1f859a83: am 15c86a84: Merge "Missing pages in print preview when scorolling." into lmp-dev
...
* commit '1f859a83ed7ea6055607785d5d8e06aa559a6c3f':
Missing pages in print preview when scorolling.
2014-09-24 15:45:03 +00:00
Svetoslav
8a5c592721
am 3ee4d02c: am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
...
* commit '3ee4d02c65180204874389f6eca809bcb83d296d':
Ignore not visible views computing click point for accessibility.
2014-09-24 15:44:58 +00:00
Joe Fernandez
1968b91937
am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
...
* commit 'b8a60dada505d79341cfa4cc2b9906d892e8298b':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
2014-09-24 15:44:50 +00:00
Joe Fernandez
b8a60dada5
Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
2014-09-24 15:39:01 +00:00
Joe Fernandez
57024257e5
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
...
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
2014-09-24 08:35:03 -07:00
Svetoslav
f61ed942cd
am 15c86a84: Merge "Missing pages in print preview when scorolling." into lmp-dev
...
* commit '15c86a84a5b595b43eecec611de22e6bd0c0eea4':
Missing pages in print preview when scorolling.
2014-09-24 15:33:58 +00:00
Svetoslav
a9f6486c92
am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
...
* commit '176b19559e3775e59ce852fa54343bea5663ee17':
Ignore not visible views computing click point for accessibility.
2014-09-24 15:33:51 +00:00
Svetoslav
2bac6129a4
Merge "Missing pages in print preview when scorolling." into lmp-dev
2014-09-24 15:24:25 +00:00
Svetoslav
856fcb6284
Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
2014-09-24 15:24:00 +00:00
Jason Monk
0012660efd
am b667c05d: am e4465aea: am f40f4af6: Merge "Add announcement of global actions dialog" into lmp-dev
...
* commit 'b667c05d06aeeb9f2202e404972b4147375ae9e1':
Add announcement of global actions dialog
2014-09-24 15:22:28 +00:00
Jason Monk
468b3b2b1d
am b5703c37: am e0000160: am c631f962: Merge "Fix accessibility announcement for QS details" into lmp-dev
...
* commit 'b5703c37c5e94515d69c331b168dff38fd085006':
Fix accessibility announcement for QS details
2014-09-24 15:22:24 +00:00
Jason Monk
4d3a3d0d96
am e4465aea: am f40f4af6: Merge "Add announcement of global actions dialog" into lmp-dev
...
* commit 'e4465aea8dd9661e972555f9624187800e98b968':
Add announcement of global actions dialog
2014-09-24 15:10:46 +00:00
Jason Monk
018f099b5f
am e0000160: am c631f962: Merge "Fix accessibility announcement for QS details" into lmp-dev
...
* commit 'e0000160e8ff6e8ebe9a110d4b8f32c74ab9cabb':
Fix accessibility announcement for QS details
2014-09-24 15:10:42 +00:00
Adrian Roos
32d88e8ead
Fix ColorInversionTile for secondary users
...
Bug: 17626692
Change-Id: I40354a460a7c00f6fd5eb05f7836dc89129fdacb
2014-09-24 17:08:22 +02:00