119423 Commits

Author SHA1 Message Date
Dirk Dougherty
47d3eaf6b1 am 958a7f72: am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '958a7f725d9d01415fe33ed2ec35eec72a6d66e3':
  Doc change: minor edits to support easier extraction of document summaries.
2014-02-13 00:13:06 +00:00
Joe Fernandez
8853b9c4b4 am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '577570f29919da32e2b616dbab1e52fadabcb315':
  MediaRouter Developer Guide
2014-02-13 00:13:02 +00:00
Nick Kralevich
4f2d02fb00 am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '20b5fd98fb9c80ed29d57d67eb706a36b02708da':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:12:55 +00:00
Dave Platt
5137fa03c3 am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '34cc9f9056e8736143e82891ccd01a85106a4518':
  Finish fixing Zygote descriptor leakage problem
2014-02-13 00:12:50 +00:00
Dirk Dougherty
958a7f725d am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '35ad8886f230d4bde4ea4cb2df9f07cf213c7cd1':
  Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:43:56 +00:00
Dirk Dougherty
35ad8886f2 am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit 'acec746b8963410d4a9324df46272ac91f846868':
  Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:37:57 +00:00
Dirk Dougherty
acec746b89 am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '55362018c9dfadff5eb1a138a1d90187110c253e':
  Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:34:35 +00:00
Joe Fernandez
577570f299 am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit 'e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
  MediaRouter Developer Guide
2014-02-12 23:33:43 +00:00
Dirk Dougherty
55362018c9 am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '271c8f12c88e87563ed17f4ad29610037bd300be':
  Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:30:19 +00:00
Joe Fernandez
e5dc0c3991 am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
  MediaRouter Developer Guide
2014-02-12 23:29:38 +00:00
Dirk Dougherty
271c8f12c8 Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 2014-02-12 23:20:41 +00:00
Joe Fernandez
5b97ec6fa0 am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
  MediaRouter Developer Guide
2014-02-12 23:19:10 +00:00
Nick Kralevich
20b5fd98fb am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 23:19:05 +00:00
Joe Fernandez
3885b00ae1 am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit 'f25bc75f591fbb04733b9cc33fabee2293973b8c':
  MediaRouter Developer Guide
2014-02-12 23:15:50 +00:00
Joe Fernandez
f25bc75f59 Merge "MediaRouter Developer Guide" into klp-docs 2014-02-12 23:13:01 +00:00
Nick Kralevich
93994e9db4 am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit 'a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 15:12:08 -08:00
Dave Platt
34cc9f9056 am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
  Finish fixing Zygote descriptor leakage problem
2014-02-12 23:10:36 +00:00
Nick Kralevich
a9bb594da6 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:37 +00:00
Dave Platt
53c7608aef am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit 'a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
  Finish fixing Zygote descriptor leakage problem
2014-02-12 15:07:07 -08:00
Dave Platt
a3c3533b1d Merge "Finish fixing Zygote descriptor leakage problem" 2014-02-12 23:03:48 +00:00
Ricardo Cervera
d34172830c am 481993e9: am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
* commit '481993e92c20907521e22a57d09c8b7c206af726':
  docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 22:22:06 +00:00
Ricardo Cervera
131c2e13ba am 6fc66187: am 7d3344fd: am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '6fc66187b1920db0a233603721c3a2db15ae1269':
  docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 22:22:03 +00:00
Ricardo Cervera
6bc06c815f am 49968bb5: am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '49968bb559cefbd96ce84b593b11203bddfa134a':
  docs: Added Revision 3 of Google APIs System Image.
2014-02-12 22:22:00 +00:00
Craig Mautner
69481d54c2 am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '8dfda07dd410c1776c6b0d373229fe77c76f8cfc':
  Don't add windows from exiting app tokens twice.
2014-02-12 22:21:56 +00:00
John Spurlock
5788f2ba9b am ae5708db: am c4aee98a: Improve error handling in listener services.
* commit 'ae5708db9d02433027f4574f912def6558805642':
  Improve error handling in listener services.
2014-02-12 22:21:42 +00:00
Narayan Kamath
efe6e05ca8 am 3caed58a: am 8fa3f443: am 54e7f53f: Merge "Fix build."
* commit '3caed58ac7f439cfeefd2dd32d57f1d7d755bd29':
  Fix build.
2014-02-12 22:20:01 +00:00
Paul Duffin
4de9111819 am 0741e11c: am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '0741e11c65350aba95df150d52674c2fab41511a':
  Improve Parcel's handling of non-primitive arrays
2014-02-12 22:19:58 +00:00
Narayan Kamath
342819663c am fc268eca: am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit 'fc268ecae13f1634054e984a7cc6e325c21f6ab5':
  Use size_t* in AssetManager::createIdmap
2014-02-12 22:19:56 +00:00
Dianne Hackborn
32acb5e9d1 am 97de064a: am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '97de064a9a01d2481c47767d7fbb5b7d5482a3aa':
  Runtime resource overlay, iteration 2, test cases
2014-02-12 22:19:53 +00:00
Joe Fernandez
70a2adc817 MediaRouter Developer Guide
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html

Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
2014-02-12 14:12:15 -08:00
Ricardo Cervera
481993e92c am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
* commit '3cb62db29583d277ba630ee1644617fff5b615e5':
  docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 22:08:33 +00:00
Ricardo Cervera
6fc66187b1 am 7d3344fd: am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '7d3344fd9c71fc3c7202250a6b4752d30da3295d':
  docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 22:08:30 +00:00
Ricardo Cervera
49968bb559 am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '6960ad58ac989ce6ab2b5d34159ceeb1093b0e39':
  docs: Added Revision 3 of Google APIs System Image.
2014-02-12 22:08:27 +00:00
Nick Kralevich
1cbea39fe1 resolved conflicts for merge of dd3d95f1 to klp-volantis-dev
Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f
2014-02-12 14:08:06 -08:00
Ricardo Cervera
3cb62db295 am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
* commit '640e0c89c3fb4ee4f180b7a2d8b9aaad237f2f9c':
  docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 22:02:53 +00:00
Ricardo Cervera
7d3344fd9c am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '58305f88fdf111f960869340d54f46387fcab4bf':
  docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 22:02:49 +00:00
Ricardo Cervera
6960ad58ac am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit 'ac74a5245bf115c4b5e23a3db515c0c3b5166662':
  docs: Added Revision 3 of Google APIs System Image.
2014-02-12 22:02:43 +00:00
Ricardo Cervera
640e0c89c3 am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
* commit '36547014a3fa62e966739e12ccd31634b17058e9':
  docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 21:59:39 +00:00
Ricardo Cervera
58305f88fd am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit 'bff7db19e3bbd2997490beec671b52e4e925c0a5':
  docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 21:59:36 +00:00
Ricardo Cervera
ac74a5245b am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '566e4df8c3ff66fae6c343524272d332510e26f4':
  docs: Added Revision 3 of Google APIs System Image.
2014-02-12 21:59:33 +00:00
Ricardo Cervera
36547014a3 am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
* commit '670944aa7272e95ba3ec02b83b2ae4f38ad577ba':
  docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 21:56:29 +00:00
Ricardo Cervera
bff7db19e3 am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '521a54d0cc5288c4467652f4d773f372eebe970b':
  docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 21:56:27 +00:00
Ricardo Cervera
566e4df8c3 am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit 'ca8757bfc5fd506c647ccd1452c53c6ca4fafb81':
  docs: Added Revision 3 of Google APIs System Image.
2014-02-12 21:56:24 +00:00
Dirk Dougherty
3155825c25 Doc change: minor edits to support easier extraction of document summaries.
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
2014-02-12 13:31:14 -08:00
Ricardo Cervera
670944aa72 Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 2014-02-12 21:05:32 +00:00
Ricardo Cervera
521a54d0cc Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 2014-02-12 21:04:40 +00:00
Ricardo Cervera
ca8757bfc5 Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 2014-02-12 21:04:00 +00:00
Craig Mautner
8dfda07dd4 am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '731c30c17dac51e2279f8f789a647c61bd55028b':
  Don't add windows from exiting app tokens twice.
2014-02-12 21:01:47 +00:00
Ricardo Cervera
10227d9c37 docs: Added Revision 3 of Google APIs System Image.
Updated Google Play services version to 4.2.42 too.

Change-Id: I1887414760e91808ed0a2574c24dab3598797f32
Review: http://quixote.mtv.corp.google.com:8003/tools/revisions/platforms.html
2014-02-12 12:59:46 -08:00
Craig Mautner
731c30c17d Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev 2014-02-12 20:56:36 +00:00