Sanket Padawe
543348eb94
am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev
...
* commit 'd2dd69ae8d81defc5f2286690b3dd246d4118fcc':
Modify getDeviceId() to get device id independent of Subscription.
2015-01-17 22:20:19 +00:00
Sanket Padawe
d2dd69ae8d
Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev
2015-01-17 22:15:56 +00:00
Scott Rowe
cee634df2c
am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
...
* commit '11ce4b759497546f4182b00cc6b92cfe42acf32e':
docs: removing code captions
2015-01-17 05:31:43 +00:00
Scott Rowe
ec015c504f
am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
...
* commit 'e019bbb1619700c952181fe9717060aaef7bce12':
docs: Add screenshot
2015-01-17 05:31:36 +00:00
Scott Rowe
11ce4b7594
am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
...
* commit 'c68ab86a8cef8b8ca4588e7eb482c5acf9821aa9':
docs: removing code captions
2015-01-17 05:25:25 +00:00
Scott Rowe
e019bbb161
am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
...
* commit '278f5e2a63961f468457ab00ceeaec84aff7bc61':
docs: Add screenshot
2015-01-17 05:25:20 +00:00
Scott Rowe
c68ab86a8c
am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
...
* commit 'ae15e779c0a0a9005292efb0f39729454429fa7f':
docs: removing code captions
2015-01-17 05:20:28 +00:00
Scott Rowe
278f5e2a63
am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
...
* commit '49caa6386c1423ad9ced3e3ad983dd233a76e2e4':
docs: Add screenshot
2015-01-17 05:20:23 +00:00
Scott Rowe
ae15e779c0
am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
...
* commit '224624e8e68bd1debd0f76d1b614ae3bdc637cb2':
docs: removing code captions
2015-01-17 03:06:38 +00:00
Scott Rowe
49caa6386c
am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
...
* commit '78001f9338b72876e95b7d25053b706804a21070':
docs: Add screenshot
2015-01-17 03:06:35 +00:00
Scott Rowe
224624e8e6
am c987ca05: Merge "docs: removing code captions" into lmp-docs
...
* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
docs: removing code captions
2015-01-17 02:28:51 +00:00
Scott Rowe
78001f9338
am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
...
* commit 'ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
docs: Add screenshot
2015-01-17 02:28:47 +00:00
Scott Rowe
c987ca0501
Merge "docs: removing code captions" into lmp-docs
2015-01-17 01:31:53 +00:00
Scott Rowe
ab18d6c82e
Merge "docs: Add screenshot" into lmp-docs
2015-01-17 01:31:15 +00:00
David Friedman
1cca3f6e39
am 912a9394: am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
...
* commit '912a9394398db1b47f0294ffdebc4d78600573fd':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 00:59:45 +00:00
David Friedman
912a939439
am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
...
* commit '91678a69b26f218dd580704cd4f79c295c8c5951':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 00:51:42 +00:00
David Friedman
91678a69b2
am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
...
* commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 00:43:30 +00:00
David Friedman
ae71c8ea52
am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
...
* commit 'e255cb0f9e0ecd5f0aa2c963f1a6d4c7029c85af':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 00:36:27 +00:00
David Friedman
e255cb0f9e
am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
...
* commit 'fa66fdd57a494bed0a92d9fb0aadf332395f371f':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
2015-01-17 00:30:18 +00:00
David Friedman
fa66fdd57a
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
2015-01-17 00:23:30 +00:00
Robert Greenwalt
51481857ea
Fix legacy request removal.
...
Don't say we're disconnected from a legacy type until there are no outstanding requests for it.
bug:18946574
Change-Id: I8e45c4a7558f7ced0840b71c50081989ba13c1c7
2015-01-16 16:06:39 -08:00
David Friedman
d28a49fb73
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
...
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
2015-01-16 15:42:26 -08:00
Craig Mautner
668cae1d47
Remove debugging and skip InputMethod windows
...
1. Remove debug for bug 17721767.
2. When adding activity windows based on base layer skip over
InputMethod windows.
Change-Id: I3600e9acd997002ce87d34df2af577cc7b648480
2015-01-16 15:29:18 -08:00
RoboErik
b2949e1b95
am 694940be: am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev
...
* commit '694940be699165aedc05d5f1ae9381cd61a368a7':
Notify the system of all remote volume changes
2015-01-16 23:08:32 +00:00
RoboErik
694940be69
am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev
...
* commit 'd5ff63ba0ce8597155e0201fd20fe18fbf0aa053':
Notify the system of all remote volume changes
2015-01-16 23:04:10 +00:00
RoboErik
d5ff63ba0c
Merge "Notify the system of all remote volume changes" into lmp-mr1-dev
2015-01-16 22:56:54 +00:00
Quddus Chong
6e2661f086
am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
...
* commit '20eb8093b634704ac29fda85e9c1c916a31bde29':
docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:50:17 +00:00
Quddus Chong
20eb8093b6
am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
...
* commit '2f63207d873fcd2c39488f78b5cb1b67f868f232':
docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:44:07 +00:00
Joe Fernandez
6a8c2b038c
am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
...
* commit 'ff96449f1d3092182d61d5e553042742d5bf71c8':
docs: adding studio-sample-in-editor.png file
2015-01-16 22:41:01 +00:00
Ricardo Cervera
eeb4cf8f43
am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit '3fee7dc78af70ac9ca383f40e511ffaa378894b1':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:40:55 +00:00
Quddus Chong
2f63207d87
am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
...
* commit 'a649122977a6f1c267329b9b67a692cabd839e98':
docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:35:03 +00:00
Joe Fernandez
ff96449f1d
am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
...
* commit '35aecbe92761c7608ce3942f5743bae8254fdaf6':
docs: adding studio-sample-in-editor.png file
2015-01-16 22:34:46 +00:00
Ricardo Cervera
3fee7dc78a
am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit '7a2e85c83eabe113ca05d2ecf4633008d601a560':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:34:42 +00:00
Joe Fernandez
35aecbe927
am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
...
* commit 'cd50066386887148f99dce9b449bed588a354bb3':
docs: adding studio-sample-in-editor.png file
2015-01-16 22:29:48 +00:00
Ricardo Cervera
7a2e85c83e
am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:29:43 +00:00
Quddus Chong
a649122977
am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
...
* commit '930ac01fd728067a79335e2983b870528c13a872':
docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:28:24 +00:00
Svet Ganov
605ba80277
am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
...
* commit '2004fdf8e54daa84a8c4da20909f81f37add66d5':
Fixing a memory leak: activities are leaked.
2015-01-16 22:25:01 +00:00
Joe Fernandez
cd50066386
am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
...
* commit '90d2aca7f05b2e2acf8a7bc37d8007074fdbdea5':
docs: adding studio-sample-in-editor.png file
2015-01-16 22:23:22 +00:00
Ricardo Cervera
9273b33f6e
am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit '73f36d47465da113f39270f4f9cf5d601aa0b585':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:23:19 +00:00
Quddus Chong
930ac01fd7
am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
...
* commit 'de0a87007b987a76af2ddd526dd473ad83fbb74b':
docs: Fixed typos in Game Controller training code snippets. bug: 17959906
2015-01-16 22:21:34 +00:00
Svet Ganov
2004fdf8e5
am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
...
* commit '830f39ad3cb2c0ff2300c7288e695def37e3b1dd':
Fixing a memory leak: activities are leaked.
2015-01-16 22:18:57 +00:00
Joe Fernandez
90d2aca7f0
am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
...
* commit '217d145d49940d28a3c5914d94ce2e56f243301b':
docs: adding studio-sample-in-editor.png file
2015-01-16 22:15:25 +00:00
Ricardo Cervera
73f36d4746
am e229751d: docs: Add browseable Wearable Support Lib Javadoc
...
* commit 'e229751d11692ede7fed3b56472f2d020767b412':
docs: Add browseable Wearable Support Lib Javadoc
2015-01-16 22:15:21 +00:00
Svet Ganov
830f39ad3c
Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
2015-01-16 22:12:56 +00:00
Adam Lesinski
42eea270a0
Process base APK
...
The base APK may have resources with configurations that compete
against some splits. The base APK must be involved in the selection
of splits.
Bug:18982001
Change-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8
2015-01-16 14:11:30 -08:00
Quddus Chong
de0a87007b
Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs
2015-01-16 22:03:33 +00:00
Joe Fernandez
217d145d49
Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
2015-01-16 21:58:37 +00:00
Craig Mautner
62e815bf7b
am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev
...
* commit '02c7c97a62ba9b79e56d1f7e206615e6eaca0689':
More debugging for bug 18201239.
2015-01-16 21:07:13 +00:00
Craig Mautner
02c7c97a62
am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev
...
* commit 'ac70b2d1722fd3ad94b2bf1e8c7695bded56987a':
More debugging for bug 18201239.
2015-01-16 21:01:25 +00:00
Craig Mautner
ac70b2d172
Merge "More debugging for bug 18201239." into lmp-mr1-dev
2015-01-16 20:56:58 +00:00
