Merge commit '9befde04c3efe82317bf06cb0d841752a71de62c'
* commit '9befde04c3efe82317bf06cb0d841752a71de62c':
Remove the hack to include Gears as it is gone now.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.
BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java
TODO:
Javadoc
Merge commit '82e7408be29c6c8c6ed80887ea97f48f38b3223d'
* commit '82e7408be29c6c8c6ed80887ea97f48f38b3223d':
aapt now attempts to process all assets even if some are malformed.
Merge commit '8735d553c58c2ff445798a26de78e89e34964d08'
* commit '8735d553c58c2ff445798a26de78e89e34964d08':
BatteryService: Add support for new standard battery voltage and temperature attributes.
Merge commit '9fb956dbdce14e38e38cb45a14610a8c822cbbf0'
* commit '9fb956dbdce14e38e38cb45a14610a8c822cbbf0':
Remove global IO context and integrate it into the RS context.
Merge commit '437f79b6b76418c70b53d7db8af80c7a3dee333b'
* commit '437f79b6b76418c70b53d7db8af80c7a3dee333b':
Fix 2058938. As zoom control is uesd in overview mode to switch to reading
refactored the code so that:
- EGL APIs that can be called before or after eglInitialize() will work by loading the drivers first
- make eglGetDisplay() a lot more efficient
- make sure that EGL drivers are loaded in a thread-safe way
- don't unload the drivers upon calling eglTerminate(), they're now never unloaded, since there is no safe way to do it (some thread could be running)
- updated our EGL version to 1.4
- return better error codes if errors happen during initialization
Merge commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03'
* commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03':
Don't use BoringLayout to display text that has paragraph-style markup.
BoringLayout assumes it doesn't have to do any work to calculate the
line height. In this case, though, there may actually be work to be
done, so have it fall back to StaticLayout to do the more thorough job.
Bug 2051050
Merge commit '517825091a2fdbdb20dc569184f2736c78ecc1bd'
* commit '517825091a2fdbdb20dc569184f2736c78ecc1bd':
Support for marshalling pointers / intptr_t in Parcel.
Merge commit '20ea6ce0e8a758cc5c33eb2577495bf9f4dce16e'
* commit '20ea6ce0e8a758cc5c33eb2577495bf9f4dce16e':
Change get/set IsSyncable() methods to static. Add isUserFacing flag to SyncAdapterType. Update api file.
Merge commit 'd87116728447eef3b73dd3b87074a5d12b532261'
* commit 'd87116728447eef3b73dd3b87074a5d12b532261':
Fix CDMA to startup/shutdown based on apn en/disab
Merge commit '736c24a8af268d014163f4687750baf18664e690'
* commit '736c24a8af268d014163f4687750baf18664e690':
Update docs: readFromParcel() is not necessary to make a class support
