git.osdn.net Git - android-x86/frameworks-base.git/log

Jorim Jaggi [Wed, 7 Jan 2015 16:04:38 +0000 (16:04 +0000)]

Merge "Remove dead code #2: Remove unused Keyguard resources"

Jorim Jaggi [Wed, 7 Jan 2015 16:04:20 +0000 (16:04 +0000)]

Merge "Remove dead code #1: Remove unused Keyguard classes"

Geoff Mendal [Wed, 7 Jan 2015 15:39:30 +0000 (15:39 +0000)]

am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE
automerge: 4e46775 -s ours

* commit '4e46775ceb609220169ec8ff9c6a1310d3fd7c34':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 7 Jan 2015 15:37:27 +0000 (15:37 +0000)]

am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE

* commit 'd79d0310b1eb6e250b3009653ac0490f35fd95bd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 7 Jan 2015 15:32:10 +0000 (15:32 +0000)]

am 585a210d: (-s ours) Import translations. DO NOT MERGE

* commit '585a210ddb09d41c5ee4347e991c4fc51e2dbebe':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 7 Jan 2015 15:24:21 +0000 (07:24 -0800)]

Import translations. DO NOT MERGE

Change-Id: I41b418841fd7a2c436257ec29312411b1277b867
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 7 Jan 2015 14:38:31 +0000 (06:38 -0800)]

Import translations. DO NOT MERGE

Change-Id: Idcfd4c630d636eeaaafd95085223178e395d0584
Auto-generated-cl: translation import

commit | commitdiff | tree

Jorim Jaggi [Fri, 19 Dec 2014 18:26:06 +0000 (19:26 +0100)]

Remove dead code #2: Remove unused Keyguard resources

Change-Id: If5e2b62556e6ee158e09e399c7ddec337dba15d5

commit | commitdiff | tree

Jorim Jaggi [Fri, 19 Dec 2014 17:13:28 +0000 (18:13 +0100)]

Remove dead code #1: Remove unused Keyguard classes

Change-Id: I08327dd23072b4e793be40635f105ce0aa5f6f6f

commit | commitdiff | tree

Robin Lee [Wed, 7 Jan 2015 12:43:41 +0000 (12:43 +0000)]

am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
automerge: 23bb3f1

* commit '23bb3f11cbe4ca64337b5b75c333ea891760213f':
Profile owner hint in warning for extra CAs

commit | commitdiff | tree

Robin Lee [Wed, 7 Jan 2015 12:41:44 +0000 (12:41 +0000)]

am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev

* commit '26e2da8ff8bdd577c915620c93805f21ff1fd65e':
Profile owner hint in warning for extra CAs

commit | commitdiff | tree

Robin Lee [Wed, 7 Jan 2015 12:36:11 +0000 (12:36 +0000)]

am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev

* commit '374c358dd201583771b7aa391c56618548f543a6':
Profile owner hint in warning for extra CAs

commit | commitdiff | tree

Robin Lee [Wed, 7 Jan 2015 12:30:54 +0000 (12:30 +0000)]

Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev

commit | commitdiff | tree

Vladimir Marko [Wed, 7 Jan 2015 10:32:50 +0000 (10:32 +0000)]

am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
automerge: 4e29869

* commit '4e2986940b2ff456693a805026c6910e950c42e2':
Check for OOM in BitmapFactory's getMimeTypeString().

commit | commitdiff | tree

Vladimir Marko [Wed, 7 Jan 2015 10:30:44 +0000 (10:30 +0000)]

am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."

* commit 'bf31cb6be4290ce161d99a2a70c318f665a14a77':
Check for OOM in BitmapFactory's getMimeTypeString().

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 10:25:58 +0000 (10:25 +0000)]

am 2458f2b1: am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins

* commit '2458f2b12b5ec266538b2019b0f14fca4e772bdf':
Fix tests on jenkins

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:25:53 +0000 (10:25 +0000)]

am 2c9d203c: am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit '2c9d203c4a167344bcac8dabf31eae27489214b0':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:25:48 +0000 (10:25 +0000)]

am 585be9c0: am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit '585be9c01455a44f467c11aaf0150b4e7393ee59':
docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

commit | commitdiff | tree

Vladimir Marko [Wed, 7 Jan 2015 10:24:43 +0000 (10:24 +0000)]

am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."

* commit '8371f2e3fac04663dae2e5fb98dbce7e32325991':
Check for OOM in BitmapFactory's getMimeTypeString().

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:24:15 +0000 (10:24 +0000)]

am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs
automerge: 159b409

* commit '159b409121096e28d8735074122c5858b6ed1093':
docs: Updated the description of the enhanced camera APIs in L. bug: 18142680

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:22:55 +0000 (10:22 +0000)]

am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
automerge: 87df2ea

* commit '87df2ea08fbb9360910c006ca920c43e5165b604':
docs: studio index typo

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:21:24 +0000 (10:21 +0000)]

am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
automerge: dbe3aba

* commit 'dbe3aba4a54bca629b727d81906516a22eee3c5c':
docs: studio bundle checksum update

commit | commitdiff | tree

Vladimir Marko [Wed, 7 Jan 2015 10:20:48 +0000 (10:20 +0000)]

Merge "Check for OOM in BitmapFactory's getMimeTypeString()."

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:19:59 +0000 (10:19 +0000)]

am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
automerge: b1c7f02

* commit 'b1c7f0215bc36b5f27d226d1fc085be99201fe7b':
docs: Checklist for TV Apps

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 10:17:51 +0000 (10:17 +0000)]

am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins

* commit 'fa490b78df732f484475e214eec033f89c5b40b7':
Fix tests on jenkins

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:17:45 +0000 (10:17 +0000)]

am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit 'dc1db5bf5413bc432c77910d11c15b0442b27ace':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:17:39 +0000 (10:17 +0000)]

am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit '0178c0d782fb19cc6235ef6722251a441734345e':
docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:17:33 +0000 (10:17 +0000)]

am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs

* commit '1f03d4ba753c9c75a430703e535f4c0cd9daef67':
docs: Updated the description of the enhanced camera APIs in L. bug: 18142680

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:17:26 +0000 (10:17 +0000)]

am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs

* commit '912b25743d241caa150fd56aa15d1a6b9c59e428':
docs: studio index typo

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:17:20 +0000 (10:17 +0000)]

am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs

* commit 'ea765e7d803bd85c81c87611f76c4f176045c0f1':
docs: studio bundle checksum update

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:17:13 +0000 (10:17 +0000)]

am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev

* commit '909f840cdaf4f172b29c2c56921c4619165c4820':
docs: Checklist for TV Apps

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 10:10:24 +0000 (10:10 +0000)]

am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins

* commit '984823f543b58ff3c064a203762530f972870d64':
Fix tests on jenkins

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:10:19 +0000 (10:10 +0000)]

am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit 'bc8b0541d7df2969264587c739e820eab7bbeea1':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:10:13 +0000 (10:10 +0000)]

am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit '7628b7282608e3995a800085746f9432b2e00623':
docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 10:10:08 +0000 (10:10 +0000)]

am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs

* commit 'fbb2796079ad17ecb5894766e518d14f7e37a0db':
docs: Updated the description of the enhanced camera APIs in L. bug: 18142680

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:10:03 +0000 (10:10 +0000)]

am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs

* commit '52aec00cb4109ae56633e02dd698de0f0f0c9191':
docs: studio index typo

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:09:58 +0000 (10:09 +0000)]

am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs

* commit '76094382cf8a8860f2fb3d837246deb1b8baed96':
docs: studio bundle checksum update

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 10:09:52 +0000 (10:09 +0000)]

am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev

* commit '4c5b5cffa7412a66cb56fe7b78daa7c0ee3d689a':
docs: Checklist for TV Apps

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 09:23:17 +0000 (09:23 +0000)]

am 7f9582ce: am 48603a39: Fix tests on jenkins

* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
Fix tests on jenkins

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 09:23:10 +0000 (09:23 +0000)]

am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit '96f11258ab19962c93b615c00b387bdc05c0d75b':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 09:23:07 +0000 (09:23 +0000)]

am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit 'decac4319172c5f1c618de93dcb2a15678c3e214':
docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

commit | commitdiff | tree

Quddus Chong [Wed, 7 Jan 2015 09:23:02 +0000 (09:23 +0000)]

am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs

* commit '4d39cfa415f1c391a94b001319b8d1c7b02b61c2':
docs: Updated the description of the enhanced camera APIs in L. bug: 18142680

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 09:22:58 +0000 (09:22 +0000)]

am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs

* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
docs: studio index typo

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 09:22:53 +0000 (09:22 +0000)]

am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs

* commit 'c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
docs: studio bundle checksum update

commit | commitdiff | tree

Joe Fernandez [Wed, 7 Jan 2015 09:14:16 +0000 (09:14 +0000)]

Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev

commit | commitdiff | tree

Sungsoo Lim [Wed, 7 Jan 2015 08:12:27 +0000 (08:12 +0000)]

am 8b2b71f5: am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev
automerge: b68c584 -s ours

* commit 'b68c58483affc8a6a9d6e011dc48f2494a5999b0':
DO NOT MERGE Implement cloneTvInputEvent

commit | commitdiff | tree

Sungsoo Lim [Wed, 7 Jan 2015 08:10:11 +0000 (08:10 +0000)]

am 8b2b71f5: am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev

* commit '8b2b71f51187528ec80241f4cc5c6f7e2f67d048':
DO NOT MERGE Implement cloneTvInputEvent

commit | commitdiff | tree

Sungsoo Lim [Wed, 7 Jan 2015 08:04:07 +0000 (08:04 +0000)]

am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev

* commit '71d8b8ce99296fdc9e4420e4d43daa6e65c65c61':
DO NOT MERGE Implement cloneTvInputEvent

commit | commitdiff | tree

Sungsoo Lim [Wed, 7 Jan 2015 07:58:15 +0000 (07:58 +0000)]

Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev

commit | commitdiff | tree

Wonsik Kim [Wed, 7 Jan 2015 07:45:25 +0000 (07:45 +0000)]

am ee4da173: am cee5c8ed: Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev
automerge: 3853d1a -s ours

* commit '3853d1a779629f73cd0ad4f259f741db91ff2721':
DO NOT MERGE TIF: change TvInputHal events to run on its own thread

commit | commitdiff | tree

Wonsik Kim [Wed, 7 Jan 2015 07:42:52 +0000 (07:42 +0000)]

am ee4da173: am cee5c8ed: Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev

* commit 'ee4da173440a55d63971a410053123efe3b567aa':
DO NOT MERGE TIF: change TvInputHal events to run on its own thread

commit | commitdiff | tree

Wonsik Kim [Wed, 7 Jan 2015 07:35:33 +0000 (07:35 +0000)]

am cee5c8ed: Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev

* commit 'cee5c8edeedb2723476d185027107faaa5fa1cec':
DO NOT MERGE TIF: change TvInputHal events to run on its own thread

commit | commitdiff | tree

Wonsik Kim [Wed, 7 Jan 2015 07:30:49 +0000 (07:30 +0000)]

Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev

commit | commitdiff | tree

Scott Rowe [Wed, 7 Jan 2015 03:30:11 +0000 (19:30 -0800)]

resolved conflicts for merge of ea0137ef to lmp-mr1-dev

Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214

commit | commitdiff | tree

Paul Miller [Wed, 7 Jan 2015 01:49:31 +0000 (01:49 +0000)]

am c2a17fff: am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
automerge: b5f149e

* commit 'b5f149e06e7e56b7652af44af9092e806665e84e':
Fix crash on pasting text in a WebView

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 01:43:39 +0000 (01:43 +0000)]

am 48603a39: Fix tests on jenkins

* commit '48603a39d4dd721d231c99e10908f4f00c4ec6b9':
Fix tests on jenkins

commit | commitdiff | tree

Paul Miller [Wed, 7 Jan 2015 01:43:27 +0000 (01:43 +0000)]

am c2a17fff: am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev

* commit 'c2a17fff8579959349e01783aa347b2e2492e0f2':
Fix crash on pasting text in a WebView

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 01:32:26 +0000 (17:32 -0800)]

Fix tests on jenkins

When the tests are run on the build server, they are run from the jar,
as opposed to the extracted build, which is default when run from an
IDE. Thus, when class.getResourceAsStream() is called with ".." in the
path, it is not resolved properly. This change explicitly resolves the
relative path, so that the test is run properly on the server.

Change-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff

commit | commitdiff | tree

Paul Miller [Wed, 7 Jan 2015 01:17:32 +0000 (01:17 +0000)]

am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev

* commit 'a517e81e2b1594da3e12c0547aabac5f357ce97b':
Fix crash on pasting text in a WebView

commit | commitdiff | tree

Paul Miller [Wed, 7 Jan 2015 01:08:33 +0000 (01:08 +0000)]

Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev

commit | commitdiff | tree

Shishir Agrawal [Wed, 7 Jan 2015 00:58:11 +0000 (00:58 +0000)]

am 7b895dea: am d0173277: am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev

* commit '7b895dea886c303dba4c31d04172e684ccec3885':
GpsLocationProvider: Read data enabled status from TelephonyManager.

commit | commitdiff | tree

Amith Yamasani [Wed, 7 Jan 2015 00:58:04 +0000 (00:58 +0000)]

am 442dcb17: am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"

* commit '442dcb1761f5f200c12c3f86409f780fbcf20e51':
NPE in SearchManager.triggerSearch

commit | commitdiff | tree

Yin-Chia Yeh [Wed, 7 Jan 2015 00:57:59 +0000 (00:57 +0000)]

am 641178f9: am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev

* commit '641178f94fa5561cb5fe2f893f689b7cd568eaa1':
Camera: doc update for color aberration modes

am 4ae347a4: am ded6ccdc: am 55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev

* commit '4ae347a4f11d34f3bc6f4fc8f7f6ca0f6588a710':
Add new mms error for no data network (airplane mode or no mobile data)

commit | commitdiff | tree

Paul Lawrence [Wed, 7 Jan 2015 00:57:39 +0000 (00:57 +0000)]

am 91bf111a: am 53d1022e: am a15d6402: Merge "Fix crash caused by toHex returning exception"

* commit '91bf111aef4a0fe1cd11f08d09d0e53c8278e51e':
Fix crash caused by toHex returning exception

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 00:57:22 +0000 (00:57 +0000)]

am 27ce2763: Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp

* commit '27ce2763325bcb7940232a11892e12fb86053cf7':
resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again

commit | commitdiff | tree

Ricardo Cervera [Wed, 7 Jan 2015 00:57:14 +0000 (00:57 +0000)]

am 641353b6: am 85e0e70d: am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.

* commit '641353b6c28708ec8a5e1eb4143138e5b3e4674b':
docs: Minor fixes to Watch Faces design guidelines.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 00:45:41 +0000 (00:45 +0000)]

am d5455fed: am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev

* commit 'd5455fedaf0a55dfe25cf94d6bbb9ecf6f305725':
Add image comparison to LayoutLib tests.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 00:45:37 +0000 (00:45 +0000)]

am a2a5ce49: resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp

* commit 'a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2':
Remove Time from CreateInfo

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 00:45:31 +0000 (00:45 +0000)]

am 5760f153: am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev

* commit '5760f1535b0bb619c72e8d4478fc65283bd89eb7':
Add DatePicker, CalendarView to LayoutLib tests

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 00:45:27 +0000 (00:45 +0000)]

am 67cf0bf4: am 84097e39: am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev

* commit '67cf0bf421370c756d93ca52697fbce03e34c09c':
Fix DatePicker rendering.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 00:45:23 +0000 (00:45 +0000)]

am adcd2241: am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev

* commit 'adcd224135e3c12f483547ffa8bb2cb0250ba923':
Make Preference-cookie map non static.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 00:45:18 +0000 (00:45 +0000)]

am d050df72: am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev

* commit 'd050df7275137f9c57ce79a7b46d51e2d1fb9290':
Fix default initial value for preferences

commit | commitdiff | tree

Deepanshu Gupta [Wed, 7 Jan 2015 00:41:58 +0000 (16:41 -0800)]

resolved conflicts for merge of 20db8770 to master

Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc

commit | commitdiff | tree

Ricardo Cervera [Wed, 7 Jan 2015 00:36:12 +0000 (00:36 +0000)]

Merge "resolved conflicts for merge of 6302a72a to master"

commit | commitdiff | tree

Alan Viverette [Wed, 7 Jan 2015 00:36:07 +0000 (00:36 +0000)]

Merge "Add getDither, getFilterBitmap to Drawable for CTS testing"

commit | commitdiff | tree

Ricardo Cervera [Wed, 7 Jan 2015 00:31:37 +0000 (16:31 -0800)]

resolved conflicts for merge of 6302a72a to master

Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd

commit | commitdiff | tree

Shishir Agrawal [Wed, 7 Jan 2015 00:24:20 +0000 (00:24 +0000)]

am d0173277: am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev

* commit 'd0173277b20b69c73ad0bc4bf4f17c8d900d4097':
GpsLocationProvider: Read data enabled status from TelephonyManager.

commit | commitdiff | tree

Amith Yamasani [Wed, 7 Jan 2015 00:17:09 +0000 (00:17 +0000)]

am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"

* commit '21735e222e0009b1ddcb080faa5b51117d0da879':
NPE in SearchManager.triggerSearch

commit | commitdiff | tree

Shishir Agrawal [Wed, 7 Jan 2015 00:16:56 +0000 (00:16 +0000)]

am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev

* commit '5a21b0c2d0fca36fbbfb32641002ad4122c6b128':
GpsLocationProvider: Read data enabled status from TelephonyManager.

commit | commitdiff | tree

Shishir Agrawal [Wed, 7 Jan 2015 00:12:15 +0000 (00:12 +0000)]

Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev

commit | commitdiff | tree

Amith Yamasani [Wed, 7 Jan 2015 00:10:56 +0000 (00:10 +0000)]

am dcf323ad: Merge "NPE in SearchManager.triggerSearch"

* commit 'dcf323adaf3d59fb720dc534380090f9df3a618c':
NPE in SearchManager.triggerSearch

commit | commitdiff | tree

Yin-Chia Yeh [Wed, 7 Jan 2015 00:10:51 +0000 (00:10 +0000)]

am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev

* commit 'c2112a75983cce62ed493ec0feafbb2c27ad76b4':
Camera: doc update for color aberration modes

commit | commitdiff | tree

Amith Yamasani [Wed, 7 Jan 2015 00:05:10 +0000 (00:05 +0000)]

Merge "NPE in SearchManager.triggerSearch"

commit | commitdiff | tree

Yin-Chia Yeh [Wed, 7 Jan 2015 00:04:13 +0000 (00:04 +0000)]

am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev

* commit '8d46f934ca56e057182882034d796cc03e960c4d':
Camera: doc update for color aberration modes

am ded6ccdc: am 55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev

* commit 'ded6ccdc7691a520e3bfe6374fd23ecec395b078':
Add new mms error for no data network (airplane mode or no mobile data)

commit | commitdiff | tree

Yin-Chia Yeh [Tue, 6 Jan 2015 23:58:59 +0000 (23:58 +0000)]

Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev

am 55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev

* commit '55fb7576c34e859a9dbd6f3825ca8cf6f3d3f88e':
Add new mms error for no data network (airplane mode or no mobile data)

Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev

commit | commitdiff | tree

Paul Lawrence [Tue, 6 Jan 2015 23:45:48 +0000 (23:45 +0000)]

am 53d1022e: am a15d6402: Merge "Fix crash caused by toHex returning exception"

* commit '53d1022e835f0556095dee168f5bb491a29fd0ac':
Fix crash caused by toHex returning exception

commit | commitdiff | tree

Paul Lawrence [Tue, 6 Jan 2015 23:39:44 +0000 (23:39 +0000)]

am a15d6402: Merge "Fix crash caused by toHex returning exception"

* commit 'a15d6402cf4f99e448c7aaa69553483cdb18e0d4':
Fix crash caused by toHex returning exception

commit | commitdiff | tree

Paul Lawrence [Tue, 6 Jan 2015 23:34:06 +0000 (23:34 +0000)]

Merge "Fix crash caused by toHex returning exception"

commit | commitdiff | tree

Paul Lawrence [Tue, 6 Jan 2015 21:11:23 +0000 (13:11 -0800)]

Fix crash caused by toHex returning exception

toHex was changed to throw an exception in
I4986a8e806d9066129f696ab9f2e80655424e723, but its caller was not adjusted
accordingly, causing a crash whenever an unencrypted device was booted.

Bug: 18886749
Change-Id: If0505f617001cf5e0d99cf14c8b09e6a6a377167

commit | commitdiff | tree

Deepanshu Gupta [Tue, 6 Jan 2015 23:00:37 +0000 (23:00 +0000)]

Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp

commit | commitdiff | tree

Deepanshu Gupta [Tue, 6 Jan 2015 22:58:37 +0000 (14:58 -0800)]

resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again

The earlier resolution (a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2)
wasn't the right one. This fixes it.

Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98

commit | commitdiff | tree

Ricardo Cervera [Tue, 6 Jan 2015 22:57:10 +0000 (22:57 +0000)]

am 85e0e70d: am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.

* commit '85e0e70dfa0deeda303a17da2d6d3981028af06f':
docs: Minor fixes to Watch Faces design guidelines.

commit | commitdiff | tree

Deepanshu Gupta [Tue, 6 Jan 2015 22:50:18 +0000 (22:50 +0000)]

am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev

* commit 'aebd7fdb66b41b77a3cf51a7cf6911e8db3c7199':
Add image comparison to LayoutLib tests.

commit | commitdiff | tree

Baligh Uddin [Tue, 6 Jan 2015 22:50:17 +0000 (22:50 +0000)]

am efc0bbec: (-s ours) am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
automerge: 5e1b4a0 -s ours

* commit '5e1b4a0c8301716bd20fa172db523013e7b698bd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Ricardo Cervera [Tue, 6 Jan 2015 22:48:36 +0000 (22:48 +0000)]

am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.

* commit '58872406a7f51f572fc272c12ab26024a358df07':
docs: Minor fixes to Watch Faces design guidelines.

commit | commitdiff | tree

Sarah Maddox [Tue, 6 Jan 2015 22:47:29 +0000 (22:47 +0000)]

am efd72a48: am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
automerge: 7aa9d75

* commit '7aa9d752c8cb5cfb9eeeeec23f53d1ad8ea271c2':
docs: Fixes typo on Play services page for Maps.