Jason Sams
db8cfd062e
am d8e891f4: am f75e4ca3: Merge "Make it harder to leak contexts"
...
* commit 'd8e891f474096c310f60ca6d2f737cdc0251003e':
Make it harder to leak contexts
2015-03-19 18:59:00 +00:00
Jason Sams
d8e891f474
am f75e4ca3: Merge "Make it harder to leak contexts"
...
* commit 'f75e4ca3945f4c299dc26f4c95d8d18ec74f41bb':
Make it harder to leak contexts
2015-03-19 18:52:47 +00:00
Andres Morales
2566dbde3f
am e39ab2ae: am f342e5e0: am ca0391eb: am c8f952ce: Write correct checksum when formatting partition
...
* commit 'e39ab2ae9c844d9f553f7214b5f80856b9389311':
Write correct checksum when formatting partition
2015-03-19 18:47:52 +00:00
Andres Morales
e39ab2ae9c
am f342e5e0: am ca0391eb: am c8f952ce: Write correct checksum when formatting partition
...
* commit 'f342e5e0ae85fa7929e9b2eb4213bbc85dbcf61c':
Write correct checksum when formatting partition
2015-03-19 18:41:31 +00:00
Jason Sams
f75e4ca394
Merge "Make it harder to leak contexts"
2015-03-19 18:38:16 +00:00
Andres Morales
f342e5e0ae
am ca0391eb: am c8f952ce: Write correct checksum when formatting partition
...
* commit 'ca0391eb524b0adad79160c48682c4edf6f49ed2':
Write correct checksum when formatting partition
2015-03-19 18:35:07 +00:00
Andres Morales
ca0391eb52
am c8f952ce: Write correct checksum when formatting partition
...
* commit 'c8f952ce9f9cadc0d38745e455c0a6388bc68a47':
Write correct checksum when formatting partition
2015-03-19 18:27:54 +00:00
Elliott Hughes
644cb09275
am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp."
...
* commit '0634fba5915073e5b46e24f0ba0d5bbc44c922a5':
Remove unused printapk.cpp.
2015-03-19 18:27:04 +00:00
Elliott Hughes
0634fba591
am 89da4ca6: Merge "Remove unused printapk.cpp."
...
* commit '89da4ca67d5bf6c35ea76f074cb2caa3d542740e':
Remove unused printapk.cpp.
2015-03-19 18:19:54 +00:00
Elliott Hughes
89da4ca67d
Merge "Remove unused printapk.cpp."
2015-03-19 18:06:17 +00:00
Yin-Chia Yeh
3816e4a73a
Merge "Camera: update createStream API to add new rotation field"
2015-03-19 17:27:39 +00:00
Eric Laurent
f09d4bd388
Merge "fix return from finally"
2015-03-19 17:20:26 +00:00
Andres Morales
c8f952ce9f
Write correct checksum when formatting partition
...
OEM unlock enabled bit is not computed in the checksum,
causing OEM Unlocking to be disabled after the second
reboot.
Bug: 19829441
Change-Id: I100bf5d3958b89323ee35b9e97b19c162209fcd7
2015-03-19 17:18:01 +00:00
Mike Lockwood
ac9e2d756e
Merge "MidiDeviceInfo: Add constants for future Bluetooth MIDI support"
2015-03-19 17:10:17 +00:00
Mathieu Chartier
543a3578ad
am 05844d57: am b7d997a7: Merge "Revert "Change jit properties to be debug properties""
...
* commit '05844d573f33c77cd7bb608a118a998506a6996d':
Revert "Change jit properties to be debug properties"
2015-03-19 17:06:43 +00:00
Chris Craik
8144923714
Merge "Fix clang build"
2015-03-19 17:01:44 +00:00
Chris Craik
c6128bae43
Fix clang build
...
Change-Id: I5336ac347123671a18401121c5f001c8f7caf54d
2015-03-19 10:00:56 -07:00
Mathieu Chartier
05844d573f
am b7d997a7: Merge "Revert "Change jit properties to be debug properties""
...
* commit 'b7d997a7b79c233869fdd5ad18b013caad4a7236':
Revert "Change jit properties to be debug properties"
2015-03-19 16:58:59 +00:00
Mathieu Chartier
b7d997a7b7
Merge "Revert "Change jit properties to be debug properties""
2015-03-19 16:44:59 +00:00
Alex Klyubin
160a253d48
am d71f548f: am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."
...
* commit 'd71f548f4803f0696af7de9a2989673cfd83800f':
Add app-level usesCleartextTraffic manifest attribute.
2015-03-19 16:43:52 +00:00
Yorke Lee
e9d827aa51
Merge "Make PhoneAccount.CAPABILITY_VIDEO_CALLING public"
2015-03-19 16:30:36 +00:00
Yorke Lee
04ed503e7b
Make PhoneAccount.CAPABILITY_VIDEO_CALLING public
...
Bug: 19824779
Change-Id: If38606d62bffbb7b794f530f3fcc09b6e5123b55
2015-03-19 09:23:43 -07:00
Alex Klyubin
d71f548f48
am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."
...
* commit '4177b8cbbfa239d68a9283124638d9399a5dd0de':
Add app-level usesCleartextTraffic manifest attribute.
2015-03-19 16:21:40 +00:00
Alex Klyubin
4177b8cbbf
Merge "Add app-level usesCleartextTraffic manifest attribute."
2015-03-19 16:10:20 +00:00
Elliott Hughes
e519c81f35
Remove unused printapk.cpp.
...
This is one of the few remaining users of libzipfile, but doesn't get built.
Not worth porting to libziparchive.
Change-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c
2015-03-19 09:03:41 -07:00
Mike Lockwood
3f5acc6d48
MidiDeviceInfo: Add constants for future Bluetooth MIDI support
...
Change-Id: Id89b691e923b9de8e5dce58527ba38e28e8e1d36
2015-03-19 08:02:50 -07:00
Vinod Krishnan
ed7cfb67e7
am 7a2df74b: am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
...
* commit '7a2df74b1124746fa5400d3ed5e6e3680c8f3601':
Make Theme.Micro point to Theme.Material
2015-03-19 09:48:03 +00:00
Vinod Krishnan
7a2df74b11
am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
...
* commit '3f782ad156d337c7c6c542696ddc67ae82fa7a84':
Make Theme.Micro point to Theme.Material
2015-03-19 09:42:46 +00:00
Vinod Krishnan
3f782ad156
Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
2015-03-19 09:36:37 +00:00
Diego Perez
1599a4a0dc
Merge "Make sure shaders use a color model compatible with the destination."
2015-03-19 09:22:27 +00:00
Benjamin Franz
bff46bac80
Add DO policy to disable safe boot mode.
...
Bug: 19615843
Change-Id: I14dbe911995ec216c57bd285d6b7b04c9684591a
2015-03-19 09:19:18 +00:00
Joe Fernandez
5955c31425
am e7114123: am bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
...
* commit 'e711412302a9e84bf14d772795a8ec58537926b9':
docs: updated Auto training landing page
2015-03-19 06:04:27 +00:00
Joe Fernandez
e711412302
am bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
...
* commit 'bf6b1e00f1981061f5a11dffdb2cf2bf58792e4a':
docs: updated Auto training landing page
2015-03-19 05:56:57 +00:00
Joe Fernandez
bf6b1e00f1
am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
...
* commit 'ebaf79018b5bcfbe83f5877d5360a1c0d46d0b97':
docs: updated Auto training landing page
2015-03-19 05:52:21 +00:00
Joe Fernandez
ebaf79018b
am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
...
* commit 'cbdfa09fc56995c8c99e8684b8c52e4f9d247a50':
docs: updated Auto training landing page
2015-03-19 05:44:33 +00:00
Joe Fernandez
e415268138
am fd711bec: am 99842c00: am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
...
* commit 'fd711bec497b60a518623f94cb30b37da976bfa0':
Revert "Doc change: add docs for SafetyNet API."
2015-03-19 05:44:24 +00:00
Joe Fernandez
9d683a0bf9
am 635d302a: am af1fd4e2: am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK relea
...
* commit '635d302a9dc3028b40b893229fbbd2b48c153bc0':
Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
2015-03-19 05:44:16 +00:00
Joe Fernandez
a3343ae79d
am e6bd00f3: am a3c2ca61: am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs
...
* commit 'e6bd00f399759625ee41b046659b1f1eb67372f7':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
2015-03-19 05:43:58 +00:00
Joe Fernandez
fd711bec49
am 99842c00: am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
...
* commit '99842c0018241ca3c0ec05c88dc57a21f24fb405':
Revert "Doc change: add docs for SafetyNet API."
2015-03-19 05:38:48 +00:00
Joe Fernandez
635d302a9d
am af1fd4e2: am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lm
...
* commit 'af1fd4e28de6cb39647a52e66887584e3a44991d':
Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
2015-03-19 05:38:41 +00:00
Joe Fernandez
e6bd00f399
am a3c2ca61: am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs
...
* commit 'a3c2ca6140b5a460fbd96618b2065066d8c2ccc8':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
2015-03-19 05:38:34 +00:00
Joe Fernandez
cbdfa09fc5
am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
...
* commit 'f8b9e92b647f247d38e02ed3cf66bdc8cf08bc1c':
docs: updated Auto training landing page
2015-03-19 05:37:09 +00:00
Joe Fernandez
f8b9e92b64
am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
...
* commit 'ae4542578ef50122bb3cd3a8334a20314957e318':
docs: updated Auto training landing page
2015-03-19 05:31:20 +00:00
Joe Fernandez
99842c0018
am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
...
* commit '7e7f3658b90da46ae8b44577420ebd6ee0e9ffa1':
Revert "Doc change: add docs for SafetyNet API."
2015-03-19 05:31:11 +00:00
Joe Fernandez
af1fd4e28d
am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs
...
* commit '7a7f89271e7fc1a6c3c881a1cb56dc88d9958f7a':
Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
2015-03-19 05:31:04 +00:00
Joe Fernandez
a3c2ca6140
am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs
...
* commit 'f038ffd7992c5e0c46fb1de6b42e747b1999bfdf':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
2015-03-19 05:30:58 +00:00
Joe Fernandez
7e7f3658b9
am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
...
* commit '2e0f6b10e2d0a9d1dc8321e4aaedde148a87bc44':
Revert "Doc change: add docs for SafetyNet API."
2015-03-19 05:24:43 +00:00
Joe Fernandez
7a7f89271e
am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs
...
* commit '1e474aeeb55a3d2ff79b6803813ba36469f3a463':
Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
2015-03-19 05:24:37 +00:00
Joe Fernandez
f038ffd799
am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs
...
* commit '6f3caae9f016666815d6bfc7daa9db13d13b6cef':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
2015-03-19 05:24:32 +00:00
Joe Fernandez
ae4542578e
am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
...
* commit 'b67971b512d95d5d9befb9d95417f9c3d8cb3a44':
docs: updated Auto training landing page
2015-03-19 05:23:30 +00:00
