Lollipop

Change-Id: I79c408f3ba040971a7be50d0ffe3d22aa3287630
(cherry picked from commit 0f8b87bf6288478ebc120ae7247f64916acff23e)
Merge "Lollipop" into studio-1.0-release
Add Nexus 6 and Nexus 9 to the Nexus device list

Change-Id: Ib42729fcd33529aca175b0169aef937bcc962df9
(cherry picked from commit 571c7d97b6ad332662d29da453a96e2ced4d0c5a)
Merge "Add Nexus 6 and Nexus 9 to the Nexus device list" into studio-1.0-release
Add skin def for nexus 6 and 9

Change-Id: Ia56d323ce76d0e2f098dce6e4b3ae6ee35005796
(cherry picked from commit bee3b006cecf52c67f6eb598086e47a9f4aaa70c)
Merge "Add skin def for nexus 6 and 9" into studio-1.0-release
Add missing densities

Also adds method to filter out densities not intended
to be used for resource folders etc.

Change-Id: I8e373b6f8fdb4779c8c10b57e8d8ddce3b854726
(cherry picked from commit ba47d0f0ee0e7a69f31bde2d672922d22fa08d7e)
Merge "Add missing densities" into studio-1.0-release
77594: Studio offers gson 2.3.0 making build fail (correct version is 2.3)

Change-Id: I41b592643110007303fc3ff18a3336afac6751de
(cherry picked from commit aec518fbb0b141b38f2631a2a0716bd2f69f3cca)
Merge "77594: Studio offers gson 2.3.0 making build fail (correct version is 2.3)" into studio-1.0-release
Remove skin definitions

The remaining custom skin code isn't in this branch

Change-Id: I7ca8cfec0d2f764a67ca0aec9736b86e703be8e8
Merge "Remove skin definitions" into studio-1.0-release
avd .lock file is actually a folder in Windows

Change-Id: I342cecc45d67a25d106c3ab6982817d1d30fdbf2
(cherry picked from commit 3baedbcc16920c6c63cecf8e84850989ec42b825)
Merge "avd .lock file is actually a folder in Windows" into studio-1.0-release
77630: "Using the appcompat library when minSdkVersion >= 14 is not necessary"

Change-Id: I9709c157b8c5078213bf50dfcf1efefc4dc3b9a6
(cherry picked from commit 7fec06626df09d320fa0c7dbb14211d75e41dcf1)
Merge "77630: "Using the appcompat library when minSdkVersion >= 14 is not necessary"" into studio-1.0-release
merge in studio-1.0-release history after reset to 62afdd6792a99f620f49ca0ab0164e39e4aa599d
Device class in ddms reads new ABI properties.

abi and abi2 are replaced by abilist in L.

https://code.google.com/p/android/issues/detail?id=78009

Change-Id: Iec0a2ce2202f4cd1ccede7caef25ee18966af202
(cherry picked from commit af95785ea3b16d0d41d2bcc24e5a2102091ae5fc)
Merge "Device class in ddms reads new ABI properties." into studio-1.0-release
Properly write BuildConfig in UTF8

Change-Id: Ia30f979d0ea1e2b91addb64e2de8e469d7bfde9f
(cherry picked from commit ca6c5df95d88d02e616f089b4170e69b8eea631f)