117350 Commits

Author SHA1 Message Date
Jim Miller
13c7984d2d am cefe47c0: am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev
* commit 'cefe47c0d3471aedd4f7d4d3b5137a2a95161ad4':
  Reduce camera launch time by about 250ms.
2013-11-13 14:27:58 -08:00
Svetoslav Ganov
9358d98d83 am 852a8895: am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
* commit '852a8895e18ad578a4c299d13615a4cbb3ee1211':
  Fix NPE at PrintSpooler in Japanese environment.
2013-11-13 14:27:54 -08:00
Jim Miller
cefe47c0d3 am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev
* commit '9c8d56a692198a3fc1629a0407ea6027f04e9a91':
  Reduce camera launch time by about 250ms.
2013-11-13 14:24:26 -08:00
Svetoslav Ganov
852a8895e1 am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
* commit 'd697ba73b5a5fc5dc502a117a8f06e8f1a5359b9':
  Fix NPE at PrintSpooler in Japanese environment.
2013-11-13 14:24:23 -08:00
Jim Miller
9c8d56a692 Merge "Reduce camera launch time by about 250ms." into klp-dev 2013-11-13 22:22:13 +00:00
Svetoslav Ganov
d697ba73b5 Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 2013-11-13 22:19:57 +00:00
Svetoslav
e84f23b5fd am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
* commit '60020252db88825b0c0951de7fef6f07d68786a9':
  Update the PrintDocumentAdapter docs.
2013-11-13 13:38:21 -08:00
Svetoslav
60020252db am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
* commit '14f300803b7d16a3c9632cb626529e873e4813f1':
  Update the PrintDocumentAdapter docs.
2013-11-13 13:34:00 -08:00
Svetoslav
14f300803b Merge "Update the PrintDocumentAdapter docs." into klp-dev 2013-11-13 21:30:58 +00:00
Dirk Dougherty
7c85b522e3 am 026d0684: am 90b7f631: Doc change: fix typo.
* commit '026d06847b535da75626211bae400729deb80f9b':
  Doc change: fix typo.
2013-11-13 13:18:55 -08:00
Dirk Dougherty
026d06847b am 90b7f631: Doc change: fix typo.
* commit '90b7f6311849fb68d2bc5fa0affb86c7e5d3a3b0':
  Doc change: fix typo.
2013-11-13 21:15:42 +00:00
Baligh Uddin
2218d330ad am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '814b0b734772bfdbaa6b1888a253afc00c78bb58':
  Import translations. DO NOT MERGE
2013-11-13 13:11:53 -08:00
Baligh Uddin
d0e2b18f55 am 4a0e3b9a: (-s ours) am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '4a0e3b9ac5cb9006a3efe951fcd7f7427d4726cc':
  Import translations. DO NOT MERGE
2013-11-13 13:11:50 -08:00
Dirk Dougherty
90b7f63118 Doc change: fix typo.
Change-Id: I74932b2dff099af1ba2bc048575586fd9e3593a5
2013-11-13 13:08:46 -08:00
Baligh Uddin
814b0b7347 am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2a22627e179cdb767c709dc68d78b4903d9239f9':
  Import translations. DO NOT MERGE
2013-11-13 13:07:52 -08:00
Baligh Uddin
4a0e3b9ac5 am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5cc3ddf16fee6d6aa8439e6ebcb3f3feeec98608':
  Import translations. DO NOT MERGE
2013-11-13 13:07:49 -08:00
Baligh Uddin
2a22627e17 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:25 +00:00
Baligh Uddin
5cc3ddf16f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:07 +00:00
Baligh Uddin
bc3be0e3dc Import translations. DO NOT MERGE
Change-Id: I3b40e99b029a65ade59ec8f7ad06c0a143895269
Auto-generated-cl: translation import
2013-11-13 12:24:32 -08:00
Christopher Tate
87b84ca6fc am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev
* commit 'e995ad1559ac12a0ac5e2e56ce378b0b29f10f24':
  Support preferred activities with zero or one scheme in the filter
2013-11-13 12:14:29 -08:00
Daniel Sandler
086034117d am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
* commit '2f4fb5eef5ac5c08f7d30c75b56990ce5a729509':
  Bespoke, handcrafted, artisanal assist affordance assets.
2013-11-13 12:14:25 -08:00
Daniel Sandler
076dcaf11b am 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev
* commit '80ffcb194b31839308bbe57c057611fd41cef5e1':
  DessertCase fixes:
2013-11-13 12:14:22 -08:00
Daniel Sandler
94913629be am 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev
* commit '6150abd8f9557a923e1e9753d5c35d241cd79411':
  Switch DeadZone to Slog.
2013-11-13 12:14:19 -08:00
John Huang
c4f535bdda am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev
* commit '299e011ebd7ce9593c203ecfc9f5eed45360a5ed':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo
2013-11-13 12:14:16 -08:00
Christopher Tate
e995ad1559 am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev
* commit '0b2c2b10053afd7a525dbf8a4eb0f0aaf98739b3':
  Support preferred activities with zero or one scheme in the filter
2013-11-13 12:07:22 -08:00
Daniel Sandler
2f4fb5eef5 am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
* commit '31f7c912f0b6a2cfa2ea0f0b3a9022e8323f5542':
  Bespoke, handcrafted, artisanal assist affordance assets.
2013-11-13 12:07:20 -08:00
Daniel Sandler
80ffcb194b am 42498417: Merge "DessertCase fixes:" into klp-dev
* commit '424984172bb2a89dd06cc49fd5a3665bc7c85e5c':
  DessertCase fixes:
2013-11-13 12:07:16 -08:00
Daniel Sandler
6150abd8f9 am f554042a: Merge "Switch DeadZone to Slog." into klp-dev
* commit 'f554042a9582c5b4ad1b0d41bc08a0caad470798':
  Switch DeadZone to Slog.
2013-11-13 12:07:13 -08:00
John Huang
299e011ebd am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev
* commit '54ca906604c2ff0a58274e5d1b66cdba4df8c3d8':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo
2013-11-13 12:07:10 -08:00
Baligh Uddin
9f500fe103 Import translations. DO NOT MERGE
Change-Id: Id312643b2e858fa84f81b37975a1757ff1773b87
Auto-generated-cl: translation import
2013-11-13 11:54:28 -08:00
Keiji Ariyama
1a8c7135f0 Fix NPE at PrintSpooler in Japanese environment.
MediaSize ID have to be upper cases.

Change-Id: I84af01dbd185df210b5ebb1de282a4091e06df05
Related-issue: https://code.google.com/p/android/issues/detail?id=61984
2013-11-13 11:43:26 -08:00
Christopher Tate
0b2c2b1005 Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 2013-11-13 19:33:46 +00:00
Daniel Sandler
31f7c912f0 Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 2013-11-13 19:32:42 +00:00
Daniel Sandler
424984172b Merge "DessertCase fixes:" into klp-dev 2013-11-13 19:32:27 +00:00
Daniel Sandler
f554042a95 Merge "Switch DeadZone to Slog." into klp-dev 2013-11-13 19:32:24 +00:00
John Huang
54ca906604 Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 2013-11-13 19:14:00 +00:00
Robert Greenwalt
955b575dd9 am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '6eddb39c857b178672218a345a276c4304e7ad37':
  Fix NPE in ConnectivityService
2013-11-13 10:27:46 -08:00
Robert Greenwalt
6eddb39c85 am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService
2013-11-13 10:25:30 -08:00
Robert Greenwalt
18490abd9b Merge "Fix NPE in ConnectivityService" 2013-11-13 18:22:26 +00:00
Raphael Moll
d24bf4ab07 am c95bfc4d: am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs
* commit 'c95bfc4dc8eb453999dedbb9a437713bd41eacb4':
  Android Studio download for 0.3.2
2013-11-13 10:18:37 -08:00
Raphael Moll
c95bfc4dc8 am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs
* commit '7b0d9a50b4f19dfd89a20b5fd004a014ae8ec02b':
  Android Studio download for 0.3.2
2013-11-13 18:13:08 +00:00
Raphael Moll
7b0d9a50b4 Merge "Android Studio download for 0.3.2" into klp-docs 2013-11-13 18:09:20 +00:00
Jeff Brown
e5ae0bfdf7 am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
* commit 'a20f625cc1006b03d4a2be90ba35d1a9783ad363':
  Finalize assets for screen casting.
2013-11-13 08:58:53 -08:00
Jeff Brown
a20f625cc1 am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
* commit '41b92b008e03be95db938e0238ccb9373c2aaadc':
  Finalize assets for screen casting.
2013-11-13 08:54:27 -08:00
Jeff Brown
41b92b008e Merge "Finalize assets for screen casting." into klp-dev 2013-11-13 16:51:53 +00:00
John Spurlock
e86ab5e1d3 am 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev
* commit '79033da8e42ba6ccf096bf10dea1e51873f7d402':
  Ensure wallpaper hint is at least as large as the display.
2013-11-13 08:50:07 -08:00
John Spurlock
79033da8e4 am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev
* commit '7d667ee2de2c6add257466d9648024d7e8402926':
  Ensure wallpaper hint is at least as large as the display.
2013-11-13 08:45:46 -08:00
Deepanshu Gupta
f7400aa1da am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
* commit '6870d29c340008919dcd9e547236b74301b3b9ef':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
2013-11-13 08:43:34 -08:00
John Spurlock
7d667ee2de Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 2013-11-13 16:41:44 +00:00
Deepanshu Gupta
6870d29c34 am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
* commit '78cfdf31b7c48589ea3a148ec1d6d573235bc06b':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
2013-11-13 08:40:08 -08:00