Andy Hung
|
b84a72cb5c
|
Merge "Revert "Add "throws IOException" to MediaCodec constructors (3)""
|
2013-11-07 04:15:32 +00:00 |
|
Andy Hung
|
8ca55fc980
|
Revert "Add "throws IOException" to MediaCodec constructors (3)"
This reverts commit 52d8aa79a31c5042d2b43d06f08fa28489b27d1b.
Change-Id: Ic706e0fb469931664499d00fa3a221726b258673
|
2013-11-07 04:06:31 +00:00 |
|
Baligh Uddin
|
f994e7915d
|
am 965f543d: (-s ours) am 89dcc8a1: (-s ours) am 41c2f04e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '965f543dcb3fc795a7c636c067edaa7f2c8e5545':
Import translations. DO NOT MERGE
|
2013-11-06 20:06:08 -08:00 |
|
Baligh Uddin
|
69f0e0bf67
|
am 1aca6e04: (-s ours) am 6695fa52: (-s ours) am 5be3186b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '1aca6e04f54cd2144a8acb8fb26e87afe93a42e3':
Import translations. DO NOT MERGE
|
2013-11-06 20:06:05 -08:00 |
|
Baligh Uddin
|
965f543dcb
|
am 89dcc8a1: (-s ours) am 41c2f04e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '89dcc8a1160222039e60b18befe4c5e3a2bd2c41':
Import translations. DO NOT MERGE
|
2013-11-06 20:02:31 -08:00 |
|
Baligh Uddin
|
1aca6e04f5
|
am 6695fa52: (-s ours) am 5be3186b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '6695fa52994fcf43f80cf5142eeacd37d5a6094d':
Import translations. DO NOT MERGE
|
2013-11-06 20:02:27 -08:00 |
|
Baligh Uddin
|
89dcc8a116
|
am 41c2f04e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '41c2f04e2a7f48c88f59e91d4b2b130dbfb2fce5':
Import translations. DO NOT MERGE
|
2013-11-06 20:00:17 -08:00 |
|
Baligh Uddin
|
6695fa5299
|
am 5be3186b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5be3186bac66fa08ad3ee86537492ada9e822879':
Import translations. DO NOT MERGE
|
2013-11-06 20:00:13 -08:00 |
|
Baligh Uddin
|
fd0afe66b1
|
Merge "Import translations. DO NOT MERGE"
|
2013-11-07 03:55:39 +00:00 |
|
Baligh Uddin
|
41c2f04e2a
|
Merge "Import translations. DO NOT MERGE" into klp-dev
|
2013-11-07 03:55:33 +00:00 |
|
Baligh Uddin
|
2d55e61bb9
|
Merge "Import translations. DO NOT MERGE"
|
2013-11-07 03:55:27 +00:00 |
|
Baligh Uddin
|
5be3186bac
|
Merge "Import translations. DO NOT MERGE" into klp-dev
|
2013-11-07 03:55:19 +00:00 |
|
Baligh Uddin
|
a91256a7d2
|
Merge "Import translations. DO NOT MERGE"
|
2013-11-07 03:55:12 +00:00 |
|
Jim Miller
|
e85d20a32e
|
am a7756cbc: am b8aba3f4: am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev
* commit 'a7756cbc62d19bef22c99990043621086f731b25':
Fix glitch with switching users from QuickSettings
|
2013-11-06 19:22:10 -08:00 |
|
Jim Miller
|
a7756cbc62
|
am b8aba3f4: am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev
* commit 'b8aba3f4df3962ea6b11806aff4479f0b61eae0f':
Fix glitch with switching users from QuickSettings
|
2013-11-06 19:20:13 -08:00 |
|
Jim Miller
|
b8aba3f4df
|
am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev
* commit 'b892ac680b045daca2926037955857889d32e1c0':
Fix glitch with switching users from QuickSettings
|
2013-11-06 19:16:59 -08:00 |
|
Jim Miller
|
b892ac680b
|
Merge "Fix glitch with switching users from QuickSettings" into klp-dev
|
2013-11-07 03:14:37 +00:00 |
|
Andy Hung
|
928f9fe466
|
Merge "Add "throws IOException" to MediaCodec constructors (3)"
|
2013-11-07 01:58:52 +00:00 |
|
Christopher Tate
|
4220ed7ed7
|
am 90be7345: am aa719e92: am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev
* commit '90be73457e0a5e526db99dc6c9d35798d87067ca':
System package permission decls take precedence over 3rd party apps'
|
2013-11-06 17:01:38 -08:00 |
|
Christopher Tate
|
90be73457e
|
am aa719e92: am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev
* commit 'aa719e92ffc2193db68c86b97fce291c27d5d4dd':
System package permission decls take precedence over 3rd party apps'
|
2013-11-06 16:59:18 -08:00 |
|
Christopher Tate
|
aa719e92ff
|
am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev
* commit 'c157cac9b2827a4eeb0ea29209fbb879a6076de4':
System package permission decls take precedence over 3rd party apps'
|
2013-11-06 16:57:01 -08:00 |
|
Christopher Tate
|
c157cac9b2
|
Merge "System package permission decls take precedence over 3rd party apps'" into klp-dev
|
2013-11-07 00:54:55 +00:00 |
|
John Reck
|
6e3cc2acae
|
Merge "Cleanups"
|
2013-11-07 00:28:18 +00:00 |
|
Chris Craik
|
16e7d730c5
|
am 2f70da2b: am 6ed16a89: am 0b807d2e: Merge "Update the layer\'s alpha value upon composition of the layer"
* commit '2f70da2bc5ce9f4766395cc9d848f0afe8f6a2a9':
Update the layer's alpha value upon composition of the layer
|
2013-11-06 16:15:38 -08:00 |
|
Adam Powell
|
de51bbdb86
|
am a719f797: am b3651b6f: am 2942053c: Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev
* commit 'a719f797be204464b6650e22a245902e44e05277':
Merge toast frame assets, update themes, etc. accordingly
|
2013-11-06 16:11:52 -08:00 |
|
Chris Craik
|
2f70da2bc5
|
am 6ed16a89: am 0b807d2e: Merge "Update the layer\'s alpha value upon composition of the layer"
* commit '6ed16a89d836a33b9242f91b05e8ecb149abf909':
Update the layer's alpha value upon composition of the layer
|
2013-11-06 16:09:54 -08:00 |
|
Adam Powell
|
a719f797be
|
am b3651b6f: am 2942053c: Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev
* commit 'b3651b6fc3cf7450bf7dc47d5f7a882d5e220087':
Merge toast frame assets, update themes, etc. accordingly
|
2013-11-06 16:08:14 -08:00 |
|
Adam Powell
|
b3651b6fc3
|
am 2942053c: Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev
* commit '2942053c25b577f4ecdd431072cc438b16d2778b':
Merge toast frame assets, update themes, etc. accordingly
|
2013-11-06 16:05:23 -08:00 |
|
Adam Powell
|
2942053c25
|
Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev
|
2013-11-07 00:01:09 +00:00 |
|
Dirk Dougherty
|
5b8a63c10a
|
am 1b753cc9: am 1ae704b8: resolved conflicts for merge of b08447ba to klp-ub-dev
* commit '1b753cc96f2ddd8289909ae46f43e9333ab1af47':
|
2013-11-06 15:57:29 -08:00 |
|
Dirk Dougherty
|
1b753cc96f
|
am 1ae704b8: resolved conflicts for merge of b08447ba to klp-ub-dev
* commit '1ae704b87efbcae9aff46776e27e72678f92ce42':
|
2013-11-06 15:55:12 -08:00 |
|
Dirk Dougherty
|
1ae704b87e
|
resolved conflicts for merge of b08447ba to klp-ub-dev
Change-Id: I77406f89d3b499f831ba4a66b7bf79039838c5b2
|
2013-11-06 15:42:01 -08:00 |
|
Chris Craik
|
a2801c5f64
|
am 4899398d: am baba771c: am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
* commit '4899398dcad50d1b9734ca5f8959712f42f72b02':
Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
|
2013-11-06 15:33:42 -08:00 |
|
Ruben Brunk
|
9cd3b1218e
|
am df049d6f: am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
* commit 'df049d6f2270b06679d51021c97eb9559f2657b7':
Disable face unlock when returning from camera.
|
2013-11-06 15:33:39 -08:00 |
|
Craig Mautner
|
df220c5c59
|
am e5bdd85a: am ea18624a: am c9d0ee5e: Merge "Tweak test for layout." into klp-dev
* commit 'e5bdd85a99839e1d557c924d5396d510151da42e':
Tweak test for layout.
|
2013-11-06 15:33:35 -08:00 |
|
Chris Craik
|
4899398dca
|
am baba771c: am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
* commit 'baba771c85ec4a8d56e07c0d963c663a99cfa0e3':
Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
|
2013-11-06 15:30:29 -08:00 |
|
Ruben Brunk
|
df049d6f22
|
am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
* commit '9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43':
Disable face unlock when returning from camera.
|
2013-11-06 15:30:26 -08:00 |
|
Craig Mautner
|
e5bdd85a99
|
am ea18624a: am c9d0ee5e: Merge "Tweak test for layout." into klp-dev
* commit 'ea18624ae557a06e49748964f951a81fd6c48370':
Tweak test for layout.
|
2013-11-06 15:30:23 -08:00 |
|
Craig Mautner
|
660041f89f
|
am a2dad41e: am 8ed10cff: am def34eb7: Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev
* commit 'a2dad41e757b8de097491aedecca80387ba3af09':
Ensure bar window state is SHOWING after rotate if visible.
|
2013-11-06 15:29:00 -08:00 |
|
Chris Craik
|
baba771c85
|
am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
* commit '47742d4bb004a51c045d443024a36d784cd38d9b':
Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
|
2013-11-06 15:26:51 -08:00 |
|
Craig Mautner
|
a2dad41e75
|
am 8ed10cff: am def34eb7: Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev
* commit '8ed10cff78460a0cc426dc5c1426a9edaafe3e67':
Ensure bar window state is SHOWING after rotate if visible.
|
2013-11-06 15:26:49 -08:00 |
|
Ruben Brunk
|
9aed2ae0bd
|
am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
* commit 'e77d2a9c62e747902bc53d40e303214705702b00':
Disable face unlock when returning from camera.
|
2013-11-06 15:26:48 -08:00 |
|
Craig Mautner
|
ea18624ae5
|
am c9d0ee5e: Merge "Tweak test for layout." into klp-dev
* commit 'c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952':
Tweak test for layout.
|
2013-11-06 15:26:45 -08:00 |
|
Chris Craik
|
47742d4bb0
|
Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
|
2013-11-06 23:23:56 +00:00 |
|
Craig Mautner
|
8ed10cff78
|
am def34eb7: Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev
* commit 'def34eb775caf8eb56248d536ec56b39c47e4431':
Ensure bar window state is SHOWING after rotate if visible.
|
2013-11-06 15:23:15 -08:00 |
|
Ruben Brunk
|
e77d2a9c62
|
Merge "Disable face unlock when returning from camera." into klp-dev
|
2013-11-06 23:22:55 +00:00 |
|
Craig Mautner
|
c9d0ee5e84
|
Merge "Tweak test for layout." into klp-dev
|
2013-11-06 23:22:12 +00:00 |
|
Craig Mautner
|
def34eb775
|
Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev
|
2013-11-06 23:19:58 +00:00 |
|
Adam Powell
|
9c5c6fdb17
|
Merge "Fix docs"
|
2013-11-06 23:07:55 +00:00 |
|
Adam Powell
|
ab42aec4bc
|
Fix docs
Change-Id: Iaeef1812e3dfa76abe40468066860f73d8a10f79
|
2013-11-06 15:00:36 -08:00 |
|