Jorim Jaggi
|
a29e81bc7f
|
Remove dead code #2: Remove unused Keyguard resources
Change-Id: If5e2b62556e6ee158e09e399c7ddec337dba15d5
|
2015-01-07 15:00:16 +01:00 |
|
Jorim Jaggi
|
5c60b64704
|
Remove dead code #1: Remove unused Keyguard classes
Change-Id: I08327dd23072b4e793be40635f105ce0aa5f6f6f
|
2015-01-07 15:00:04 +01:00 |
|
Robin Lee
|
8e99586830
|
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
|
2015-01-07 12:43:41 +00:00 |
|
Robin Lee
|
23bb3f11cb
|
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
|
2015-01-07 12:41:44 +00:00 |
|
Robin Lee
|
26e2da8ff8
|
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
|
2015-01-07 12:36:11 +00:00 |
|
Robin Lee
|
374c358dd2
|
Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
|
2015-01-07 12:30:57 +00:00 |
|
Vladimir Marko
|
2e61c04070
|
am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
automerge: 4e29869
* commit '4e2986940b2ff456693a805026c6910e950c42e2':
Check for OOM in BitmapFactory's getMimeTypeString().
|
2015-01-07 10:32:50 +00:00 |
|
Vladimir Marko
|
4e2986940b
|
am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
* commit 'bf31cb6be4290ce161d99a2a70c318f665a14a77':
Check for OOM in BitmapFactory's getMimeTypeString().
|
2015-01-07 10:30:44 +00:00 |
|
Deepanshu Gupta
|
b5af276e5e
|
am 2458f2b1: am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins
* commit '2458f2b12b5ec266538b2019b0f14fca4e772bdf':
Fix tests on jenkins
|
2015-01-07 10:25:58 +00:00 |
|
Quddus Chong
|
8b0250b820
|
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
|
2015-01-07 10:25:53 +00:00 |
|
Quddus Chong
|
d3d707ed92
|
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
|
2015-01-07 10:25:48 +00:00 |
|
Vladimir Marko
|
bf31cb6be4
|
am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
* commit '8371f2e3fac04663dae2e5fb98dbce7e32325991':
Check for OOM in BitmapFactory's getMimeTypeString().
|
2015-01-07 10:24:43 +00:00 |
|
Quddus Chong
|
50a0796e69
|
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
|
2015-01-07 10:24:15 +00:00 |
|
Joe Fernandez
|
de60e6d00a
|
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
|
2015-01-07 10:22:55 +00:00 |
|
Joe Fernandez
|
3f4242b89a
|
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
|
2015-01-07 10:21:24 +00:00 |
|
Vladimir Marko
|
8371f2e3fa
|
Merge "Check for OOM in BitmapFactory's getMimeTypeString()."
|
2015-01-07 10:20:50 +00:00 |
|
Joe Fernandez
|
597da2488a
|
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
|
2015-01-07 10:19:59 +00:00 |
|
Deepanshu Gupta
|
2458f2b12b
|
am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins
* commit 'fa490b78df732f484475e214eec033f89c5b40b7':
Fix tests on jenkins
|
2015-01-07 10:17:51 +00:00 |
|
Quddus Chong
|
2c9d203c4a
|
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
|
2015-01-07 10:17:45 +00:00 |
|
Quddus Chong
|
585be9c014
|
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
|
2015-01-07 10:17:39 +00:00 |
|
Quddus Chong
|
159b409121
|
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
|
2015-01-07 10:17:33 +00:00 |
|
Joe Fernandez
|
87df2ea08f
|
am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit '912b25743d241caa150fd56aa15d1a6b9c59e428':
docs: studio index typo
|
2015-01-07 10:17:26 +00:00 |
|
Joe Fernandez
|
dbe3aba4a5
|
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
|
2015-01-07 10:17:20 +00:00 |
|
Joe Fernandez
|
b1c7f0215b
|
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
|
2015-01-07 10:17:13 +00:00 |
|
Deepanshu Gupta
|
fa490b78df
|
am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins
* commit '984823f543b58ff3c064a203762530f972870d64':
Fix tests on jenkins
|
2015-01-07 10:10:24 +00:00 |
|
Quddus Chong
|
dc1db5bf54
|
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
|
2015-01-07 10:10:19 +00:00 |
|
Quddus Chong
|
0178c0d782
|
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
|
2015-01-07 10:10:13 +00:00 |
|
Quddus Chong
|
1f03d4ba75
|
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
|
2015-01-07 10:10:08 +00:00 |
|
Joe Fernandez
|
912b25743d
|
am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit '52aec00cb4109ae56633e02dd698de0f0f0c9191':
docs: studio index typo
|
2015-01-07 10:10:03 +00:00 |
|
Joe Fernandez
|
ea765e7d80
|
am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
* commit '76094382cf8a8860f2fb3d837246deb1b8baed96':
docs: studio bundle checksum update
|
2015-01-07 10:09:58 +00:00 |
|
Joe Fernandez
|
909f840cda
|
am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
* commit '4c5b5cffa7412a66cb56fe7b78daa7c0ee3d689a':
docs: Checklist for TV Apps
|
2015-01-07 10:09:52 +00:00 |
|
Deepanshu Gupta
|
984823f543
|
am 7f9582ce: am 48603a39: Fix tests on jenkins
* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
Fix tests on jenkins
|
2015-01-07 09:23:17 +00:00 |
|
Quddus Chong
|
bc8b0541d7
|
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
|
2015-01-07 09:23:10 +00:00 |
|
Quddus Chong
|
7628b72826
|
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
|
2015-01-07 09:23:07 +00:00 |
|
Quddus Chong
|
fbb2796079
|
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
|
2015-01-07 09:23:02 +00:00 |
|
Joe Fernandez
|
52aec00cb4
|
am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
docs: studio index typo
|
2015-01-07 09:22:58 +00:00 |
|
Joe Fernandez
|
76094382cf
|
am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
* commit 'c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
docs: studio bundle checksum update
|
2015-01-07 09:22:53 +00:00 |
|
Joe Fernandez
|
4c5b5cffa7
|
Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
|
2015-01-07 09:14:17 +00:00 |
|
Sungsoo Lim
|
d52531f9ad
|
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
|
2015-01-07 08:12:27 +00:00 |
|
Sungsoo Lim
|
b68c58483a
|
am 8b2b71f5: am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev
* commit '8b2b71f51187528ec80241f4cc5c6f7e2f67d048':
DO NOT MERGE Implement cloneTvInputEvent
|
2015-01-07 08:10:11 +00:00 |
|
Sungsoo Lim
|
8b2b71f511
|
am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev
* commit '71d8b8ce99296fdc9e4420e4d43daa6e65c65c61':
DO NOT MERGE Implement cloneTvInputEvent
|
2015-01-07 08:04:07 +00:00 |
|
Sungsoo Lim
|
71d8b8ce99
|
Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev
|
2015-01-07 07:58:18 +00:00 |
|
Wonsik Kim
|
babdce1918
|
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
|
2015-01-07 07:45:25 +00:00 |
|
Wonsik Kim
|
3853d1a779
|
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
|
2015-01-07 07:42:52 +00:00 |
|
Wonsik Kim
|
ee4da17344
|
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
|
2015-01-07 07:35:33 +00:00 |
|
Wonsik Kim
|
cee5c8edee
|
Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev
|
2015-01-07 07:30:53 +00:00 |
|
Scott Rowe
|
188a8774c9
|
resolved conflicts for merge of ea0137ef to lmp-mr1-dev
Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214
|
2015-01-06 19:30:11 -08:00 |
|
Paul Miller
|
4adf212743
|
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
|
2015-01-07 01:49:31 +00:00 |
|
Deepanshu Gupta
|
7f9582ce61
|
am 48603a39: Fix tests on jenkins
* commit '48603a39d4dd721d231c99e10908f4f00c4ec6b9':
Fix tests on jenkins
|
2015-01-07 01:43:39 +00:00 |
|
Paul Miller
|
b5f149e06e
|
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
|
2015-01-07 01:43:27 +00:00 |
|