Joe Fernandez
80cfbedbfd
am 6ea9db4b: am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs automerge: a878256
...
* commit '6ea9db4b6434b9f2c1059e7c4a050ea4245a7342':
docs: studio basics haxm updates
2014-12-12 04:25:59 +00:00
Ricardo Cervera
dd4b92b3fa
am c0276ebd: am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs automerge: 575c8c9
...
* commit 'c0276ebd93554b9c3bfde2587b00ca79afa6ed05':
docs: Fixes to watch faces docs.
2014-12-12 04:25:54 +00:00
Rich Slogar
bde459f33e
am cc46ad8d: am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs automerge: 51f1c26
...
* commit 'cc46ad8d66d71867ff59bcd73b8e0861ef1744c5':
docs: studio bundle update
2014-12-12 04:25:49 +00:00
Joe Fernandez
e5624ae02b
am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs automerge: cc08e61
...
* commit '11fc651aefbcdebc646f347e4981204d3ef7b0a7':
docs: platform updates for api 21
2014-12-12 04:21:22 +00:00
Joe Fernandez
3e42bb70e4
am 4cb6d10d: am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs automerge: 11bccb1
...
* commit '4cb6d10d5e7d7b21a1d9ee2d0b69c7a34f86503c':
docs: sdk tools 24.0.1 revisions
2014-12-12 04:21:17 +00:00
Andrew Solovay
117a8f8af0
am d96ed254: am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" automerge: fe96791
...
* commit 'd96ed254db9c9eea778bdc8fee2a983d3a38acae':
docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-12 04:21:12 +00:00
Ruben Brunk
00b2eb2bc0
am c7c20b34: am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev automerge: 81b381b
...
* commit 'c7c20b34ecbaef5c1f60115755e87dbaaf0cfb4c':
camera2: Fix LEGACY YUV production and orientation.
2014-12-12 04:21:07 +00:00
Joe Fernandez
6ea9db4b64
am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
automerge: a878256
2014-12-12 04:19:03 +00:00
Ricardo Cervera
c0276ebd93
am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
automerge: 575c8c9
2014-12-12 04:17:41 +00:00
Rich Slogar
cc46ad8d66
am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
...
automerge: 51f1c26
2014-12-12 04:16:30 +00:00
Joe Fernandez
11fc651aef
am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
...
automerge: cc08e61
2014-12-12 04:14:43 +00:00
Joe Fernandez
4cb6d10d5e
am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
...
automerge: 11bccb1
2014-12-12 04:13:20 +00:00
Jason Monk
fe97467bfc
am 239c7667: am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev automerge: 70cf2f7
...
* commit '239c7667dd71754029b27fdec7b63f7f8e15c86b':
Fix crash in BluetoothControllerImpl
2014-12-12 04:12:21 +00:00
Amit Mahajan
368cf66e20
am dee84a87: am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev automerge: cac8662
...
* commit 'dee84a8796ed60a4a87d95238e160394fb166a95':
Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
2014-12-12 04:12:16 +00:00
John Spurlock
281dc0aadf
am 97a2be86: am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev automerge: 6f9a717
...
* commit '97a2be8672febec536641fb37f4900e4402035b0':
Zen: Leave zen=none on manual ringer mode stream volume changes.
2014-12-12 04:12:10 +00:00
Andrew Solovay
d96ed254db
am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
...
automerge: fe96791
2014-12-12 04:11:53 +00:00
Ruben Brunk
c7c20b34ec
am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
...
automerge: 81b381b
2014-12-12 04:09:55 +00:00
Jason Monk
239c7667dd
am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev
...
automerge: 70cf2f7
2014-12-12 04:08:33 +00:00
Amit Mahajan
dee84a8796
am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev
...
automerge: cac8662
* commit 'cac8662943b28663fefc6e5315a7b9acd514bfdb':
Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
2014-12-12 04:05:59 +00:00
John Spurlock
97a2be8672
am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev
...
automerge: 6f9a717
2014-12-12 04:04:40 +00:00
Chih-hung Hsieh
17a0826e5d
am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
...
automerge: d1aa67b
2014-12-11 21:05:00 +00:00
Joe Fernandez
a878256b59
am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
* commit '817796940bf79942ccd950cec47815039a2aa15e':
docs: studio basics haxm updates
2014-12-11 21:03:11 +00:00
Ricardo Cervera
575c8c9fcd
am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
* commit 'af7070e6f0bb2b035b1d2565fdd50b6bde210864':
docs: Fixes to watch faces docs.
2014-12-11 21:03:06 +00:00
Rich Slogar
51f1c26b5b
am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
...
* commit '0564cee3c7537c916c74e560e2160b0f0657a9eb':
docs: studio bundle update
2014-12-11 21:02:44 +00:00
Joe Fernandez
cc08e619d6
am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
...
* commit '07877955bef2132ea5e8d02662a7f0ca1aad5f7d':
docs: platform updates for api 21
2014-12-11 21:02:37 +00:00
Joe Fernandez
11bccb1ebe
am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
...
* commit 'e3bac3bc8f015a1ee8238fef7ca155fb432beb51':
docs: sdk tools 24.0.1 revisions
2014-12-11 21:02:32 +00:00
Andrew Solovay
fe967912fa
am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
...
* commit '13e0a6505fd049a8df47aa8fa01b7c8c3120dea1':
docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 21:02:26 +00:00
Chih-hung Hsieh
d1aa67b8e1
am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
...
* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
Adjust format strings to work on both 32-bit and 64-bit builds
2014-12-11 21:02:08 +00:00
Joe Fernandez
817796940b
am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
docs: studio basics haxm updates
2014-12-11 20:55:53 +00:00
Ricardo Cervera
af7070e6f0
am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
* commit '64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
docs: Fixes to watch faces docs.
2014-12-11 20:55:49 +00:00
Rich Slogar
0564cee3c7
am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
...
* commit 'b490f297101bcf31f56278d21d5f56a5e5998a58':
docs: studio bundle update
2014-12-11 20:55:45 +00:00
Joe Fernandez
07877955be
am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
...
* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
docs: platform updates for api 21
2014-12-11 20:55:35 +00:00
Joe Fernandez
e3bac3bc8f
am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
...
* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
docs: sdk tools 24.0.1 revisions
2014-12-11 20:55:29 +00:00
Andrew Solovay
13e0a6505f
am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
...
* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 20:55:23 +00:00
Chih-hung Hsieh
b0dd6d3a8a
am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
...
* commit '4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
Adjust format strings to work on both 32-bit and 64-bit builds
2014-12-11 20:54:56 +00:00
Chih-hung Hsieh
4c23a0ec16
Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
2014-12-11 20:49:30 +00:00
Joe Fernandez
c9014b6d59
am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
* commit 'ea500a3adf6bcf17ad22f05acd8c3220358f72ce':
docs: studio basics haxm updates
2014-12-11 19:59:00 +00:00
Ruben Brunk
81b381b82e
am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
...
* commit 'f6ed526b3a02bac9c5912a9655e5890f332cefc6':
camera2: Fix LEGACY YUV production and orientation.
2014-12-11 19:55:02 +00:00
Joe Fernandez
ea500a3adf
am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
* commit '0aa234457737cdb31538711251920aef3a70bb56':
docs: studio basics haxm updates
2014-12-11 19:50:39 +00:00
Ruben Brunk
f6ed526b3a
Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
2014-12-11 19:48:37 +00:00
Ricardo Cervera
64d97cb2ad
am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
* commit '6621a4f6f9c63ff952c5e64a5ae1e41ef5ac5960':
docs: Fixes to watch faces docs.
2014-12-11 19:43:25 +00:00
Joe Fernandez
0aa2344577
Merge "docs: studio basics haxm updates" into lmp-docs
2014-12-11 19:43:18 +00:00
Ruben Brunk
433e715cc0
camera2: Fix LEGACY YUV production and orientation.
...
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
2014-12-11 11:35:46 -08:00
Ricardo Cervera
6621a4f6f9
am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
* commit '9fe34d9037dc27abb89c64ff75b87fdf9a4eaa8b':
docs: Fixes to watch faces docs.
2014-12-11 19:35:41 +00:00
Ricardo Cervera
9fe34d9037
Merge "docs: Fixes to watch faces docs." into lmp-docs
2014-12-11 19:28:41 +00:00
Jason Monk
70cf2f72f2
am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev
...
* commit '7d8ccb41fa3756839597cd28cd5710c1b690e17f':
Fix crash in BluetoothControllerImpl
2014-12-11 19:28:28 +00:00
Jason Monk
7d8ccb41fa
Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev
2014-12-11 19:22:20 +00:00
Rich Slogar
b490f29710
am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
...
* commit '5c853c26a879c411a98e1530247a41a856f7784c':
docs: studio bundle update
2014-12-11 19:17:05 +00:00
Rich Slogar
5c853c26a8
am d35216ad: Merge "docs: studio bundle update" into lmp-docs
...
* commit 'd35216ad36aefb121167ad781b25f7a37d5c1e52':
docs: studio bundle update
2014-12-11 19:09:39 +00:00
Rich Slogar
d35216ad36
Merge "docs: studio bundle update" into lmp-docs
2014-12-11 19:04:03 +00:00
