Deepanshu Gupta
3baef70ca5
am 95da2621: Update platform SDK component to revision 5. [DO NOT MERGE]
...
* commit '95da262195c8cc13c20d4b0bd70c87ae49046cf1':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 21:43:46 +00:00
Deepanshu Gupta
a9078f4a2b
am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '7ee92e43446fe4f9c5f30e997afabe443719bca1':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:42:35 +00:00
Deepanshu Gupta
a6131422fd
am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
...
* commit '82b828e178eef7b0da6325f4f2cb39c0b5b68cef':
Update platform SDK component to revision 2. [DO NOT MERGE]
2014-07-18 21:40:08 +00:00
Deepanshu Gupta
a6da0ee8ca
am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '7ee92e43446fe4f9c5f30e997afabe443719bca1':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:39:30 +00:00
Deepanshu Gupta
d440205128
am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '7f724995d9c4140f6432de4c9bdda8716d8e6059':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:39:27 +00:00
Sungsoo Lim
51324e22d1
Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev
2014-07-17 22:03:23 +00:00
Baligh Uddin
dbd7a9fbdf
Remove deprecated locales - DO NOT MERGE
...
Change-Id: If073e059cb3161240952fafde16878c502c69341
2014-07-19 13:04:57 -07:00
Sungsoo Lim
e88684d024
Remove the dummy implementation of onContentUnblocked()
...
This reverts commit 3b0abb7811 .
Change-Id: I784cdd5ce0fe78ba66ed5e8cb8135b9082b4aa1c
2014-07-19 04:52:42 +00:00
Deepanshu Gupta
7f295eefbe
am 8d6dee77: am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '8d6dee775951bf77f0b635bb3a551e02a208e1a4':
2014-07-19 00:42:10 +00:00
Deepanshu Gupta
8b8fca4898
am db204c79: am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'db204c7992edcac02a4a8770bfcb0b906f6543e4':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-19 00:42:03 +00:00
Deepanshu Gupta
3b929a7a1a
am 2aad5082: (-s ours) am 2cdeb60c: am a2c022fa: am 5b6f4fc6: am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '2aad5082c408725de95afc593d4287ea516a9ee6':
2014-07-19 00:41:55 +00:00
Deepanshu Gupta
884d4cb440
am d898a214: (-s ours) am 591f5c8b: am 1fa56bef: am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'd898a214c0b9e48e3be2556b2ddd08d05e4a6678':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-19 00:41:54 +00:00
Deepanshu Gupta
e731ac39a7
am 6b014b79: (-s ours) am 25337462: am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '6b014b79664989356b68e44e39662eb5f457b3aa':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-19 00:41:45 +00:00
Deepanshu Gupta
3b9da34f27
am a6131422: (-s ours) am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
...
* commit 'a6131422fd68ccfced1a055c8e1d84e3cb500710':
Update platform SDK component to revision 2. [DO NOT MERGE]
2014-07-19 00:41:27 +00:00
Chris Craik
644678f99b
Update Outline API
...
Change-Id: Ia9a4ce9e50473f4c1ee46fe40506c6a9736043a7
2014-07-18 15:26:29 -07:00
Youngsang Cho
3ee98b1ad0
Merge "AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()" into lmp-dev
2014-07-18 18:24:25 +00:00
Jaewan Kim
3b0abb7811
AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()
...
Bug: 13172379
Change-Id: I0c165632bf842ec0d7ea54cc4eecc0cd305ad602
2014-07-18 02:24:23 +00:00
Chulwoo Lee
9f688cc161
Merge "Put input ID when inserting channels" into lmp-dev
2014-07-17 22:03:23 +00:00
Chulwoo Lee
f96eb6672e
Put input ID when inserting channels
...
Change-Id: I1c9944db6fd9d05cfbbfffe2e3464b6f16b7445b
2014-07-18 18:27:30 +09:00
Wonsik Kim
859cc5f0e6
Merge "Adjust to onCreateSession() method signature change" into lmp-dev
2014-07-17 22:03:23 +00:00
Wonsik Kim
e7713aa686
Adjust to onCreateSession() method signature change
...
Change-Id: I6137f2d85eb2ca18fb3e50bac54f048470145cd5
2014-07-18 13:10:02 +09:00
Ying Wang
90b2bdae91
Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev
2014-07-17 21:58:28 +00:00
Ying Wang
567a46bf22
3rd attempt to build and store android_system.jar in sdk builds.
...
Change-Id: Ica053e3ef6e3190ab4dcc32b3b7d06fc4c619884
2014-07-18 09:16:40 -07:00
Deepanshu Gupta
82b828e178
Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
2014-07-17 21:09:48 +00:00
Yigit Boyar
850c44e0ec
Merge "Update divider item decorator to account for view translation" into lmp-dev
2014-07-17 17:59:02 +00:00
Yigit Boyar
cc33d7ec0f
Update divider item decorator to account for view translation
...
Bug: 16241985
Change-Id: Id441a07fe547493007e9e05d1039bac526847a1c
2014-07-17 16:37:21 -07:00
Jae Seo
d85449be24
Quick build fix
...
Change-Id: I7b660363a53b77249c6ac94a78f25c70b449d0fc
2014-07-17 13:16:48 -07:00
Ying Wang
38bf922ac1
Merge ""sdk" is not necessarily on the linux command line." into lmp-dev
2014-07-17 17:59:02 +00:00
Ying Wang
c39b6ebb2f
"sdk" is not necessarily on the linux command line.
...
Bug: 16208466
Change-Id: I29f8763e9763d2b482744d0c7a74c122a299d03b
2014-07-17 21:18:09 -07:00
Jae Seo
c9bdea0489
AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API
...
Change-Id: Ibe757445aa087f2bedd2c645981ec99cce1dc8c4
2014-07-17 20:43:23 -07:00
Jim Miller
94a862f010
Add new "pin complex" type to supported keyguard PINs
...
This adds a feature to allow DevicePolicyAdmins to prevent using
simple PINs, which are defined as those containing more than 3
repeated values. Examples include '1234', '2468', '1111', '9876', etc.
Bug 12081139
Change-Id: I4c7ae51730c23ad8050e6216a62a8038d9c645a6
2014-07-16 23:49:23 +00:00
Ying Wang
59db26c5d2
Merge "Build and store android_system.jar." into lmp-dev
2014-07-16 16:25:13 +00:00
Ying Wang
c41276ede6
Build and store android_system.jar.
...
Bug: 16208466
Change-Id: Ibc078339dff56233a9f8f11228f5299ef389f967
2014-07-14 20:39:54 -07:00
Tadashi G. Takaoka
0d519132cb
(DO NOT MERGE) Fix SampleSpellCheckerService settings
...
Change-Id: Ifce72f3fe3153ef0086d4f47edb81faa475cc543
(cherry picked from commit 4efbb0254e )
2014-07-15 02:53:41 +00:00
Elliott Hughes
a8e31235e9
Add the arm64 pstate register to the stack tool.
...
Also take into account the fact that the arm pcsr register is the
fifth entry on its line, so the stack tool previously stripped that
off.
(cherry picked from commit be4de46d09 )
Change-Id: I0a937ae1a36071c3aaa5d955f56ee034dfdfe7de
2014-07-14 19:01:02 -07:00
Jae Seo
ca1c55b353
AtscInput: Add a dummy implementation of abstract onSetCaptionEnabled()
...
Change-Id: I9e65cb2a2f6da8ce4ed32c9c2ffb2c6523425f4b
2014-07-12 20:38:17 -07:00
Chet Haase
dcabc1acae
Merge "Add RecyclerView animations for change actions"
2014-07-10 21:09:47 +00:00
Ying Wang
4391853b56
Fix win_sdk build.
...
Change-Id: I59ac4789b462f356811d0f7dc20d850bbc16dfaf
2014-07-11 11:16:32 -07:00
Andrew Hsieh
d163bd845c
am 5d8817f5: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
...
* commit '5d8817f5d5ae23678fbd076a9e7d41705b0b2858':
2014-07-11 17:32:58 +00:00
Andrew Hsieh
d749247c98
am 70aad066: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
...
* commit '70aad0665bc051381c8b1611a0ef8be76414775a':
2014-07-11 17:32:56 +00:00
Andrew Hsieh
f52b8c3469
am 3eb82eca: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
...
* commit '3eb82eca45013e2a78158b8a2f616dba0db958ac':
2014-07-11 17:32:55 +00:00
Andrew Hsieh
5d8817f5d5
am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
...
* commit 'f22634e3b22590fde355143ea6c1437c713b7bee':
Refresh 64-bit headers/libs (WW28)
2014-07-11 16:18:54 +00:00
Andrew Hsieh
70aad0665b
am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
...
* commit 'e19c8d59b8bb3f8eb5718184c99ddd5048ee4199':
Update mips64 lib-bootstrap
2014-07-11 16:18:51 +00:00
Andrew Hsieh
3eb82eca45
am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
...
* commit '1c7d5d11c73946bd1ff86ad49aa9123a1111610e':
Remove symlink lib-boostrap
2014-07-11 16:18:49 +00:00
Leon Scroggins III
c7095947cb
Call setShader after setLocalMatrix.
...
After updating a Shader's Matrix, set the Shader on the Paint again,
so it will take effect.
BUG:14315916
Change-Id: Ibf732f7f417d2a52500fabf4d660be7fcfb59f43
2014-07-10 14:10:43 -04:00
Chet Haase
73244273b9
Add RecyclerView animations for change actions
...
Issue #15691746 RecyclerView item animations for changed/resizing item views
Change-Id: Ibe735eefa704189d17f63406de941d76282e9272
2014-07-10 07:46:18 -07:00
Deepanshu Gupta
ba188a67c3
am 2c353e75: (-s ours) Update platform SDK component to L
...
* commit '2c353e752944345f4fef21006271448c566f56eb':
Update platform SDK component to L
2014-07-10 01:33:05 +00:00
Elliott Hughes
ae20705695
am 95f5ef2a: am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
...
* commit '95f5ef2a1247dcd3d175394f4ebbf759f3fc2f02':
Fix testrunner's reference to icu4c.
2014-07-10 00:50:15 +00:00
Elliott Hughes
95f5ef2a12
am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
...
* commit 'e72af21577c139a8d466da9b826dbd33528e0d9b':
Fix testrunner's reference to icu4c.
2014-07-10 00:21:54 +00:00
Elliott Hughes
e72af21577
am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
...
* commit '8de48e23757c14cacb0a53be4f26e9e9e927e429':
Fix testrunner's reference to icu4c.
2014-07-10 00:16:45 +00:00