81216 Commits

Author SHA1 Message Date
Ying Wang
2537012ad9 Import translations. DO NOT MERGE
Change-Id: I36ca6b7f93e73b04ac742b3d7d640ef3c1bf48dd
2012-06-27 14:09:58 -07:00
Scott Main
7decabbe4c am c16f40ae: am fec0c188: Merge "docs: add info about live wallpaper picker" into jb-dev
* commit 'c16f40aecca3d58aa826fa4b65f3764b963c30d6':
  docs: add info about live wallpaper picker
2012-06-27 02:18:14 -07:00
Scott Main
c8346adcfe am a31e954f: am b6d148d0: Merge "docs: remove empty page and expand system requirements based on URL hash" into jb-dev
* commit 'a31e954f0a33e810891c8ce199292c17f85b1e98':
  docs: remove empty page and expand system requirements based on URL hash
2012-06-27 02:18:10 -07:00
Scott Main
c16f40aecc am fec0c188: Merge "docs: add info about live wallpaper picker" into jb-dev
* commit 'fec0c188ff7ab39b272561ea2e48aafc72c35ded':
  docs: add info about live wallpaper picker
2012-06-27 02:15:12 -07:00
Scott Main
a31e954f0a am b6d148d0: Merge "docs: remove empty page and expand system requirements based on URL hash" into jb-dev
* commit 'b6d148d02a9764abd40af50b096599bb148571b3':
  docs: remove empty page and expand system requirements based on URL hash
2012-06-27 02:15:09 -07:00
Scott Main
fec0c188ff Merge "docs: add info about live wallpaper picker" into jb-dev 2012-06-27 02:13:17 -07:00
Scott Main
b6d148d02a Merge "docs: remove empty page and expand system requirements based on URL hash" into jb-dev 2012-06-27 02:12:35 -07:00
Dirk Dougherty
5a62f57d65 am 2c6a762c: am 84ea453c: Merge "Doc change: remove an unneeded file. Edits." into jb-dev
* commit '2c6a762c1adfd76fd67b521ffed69992eb6245dc':
  Doc change: remove an unneeded file. Edits.
2012-06-27 01:24:02 -07:00
Dirk Dougherty
2c6a762c1a am 84ea453c: Merge "Doc change: remove an unneeded file. Edits." into jb-dev
* commit '84ea453cc7a9f193cfef1b3e2af41935dbe15d02':
  Doc change: remove an unneeded file. Edits.
2012-06-27 01:21:04 -07:00
Dirk Dougherty
8eacc1923b am aaff44ca: am aaecf93b: Merge "Doc change: add diff report for 16." into jb-dev
* commit 'aaff44ca5a9f01fd3c4b988e477e14a9342a4fd4':
  Doc change: add diff report for 16.
2012-06-27 01:19:58 -07:00
Dirk Dougherty
84ea453cc7 Merge "Doc change: remove an unneeded file. Edits." into jb-dev 2012-06-27 01:18:22 -07:00
Dirk Dougherty
aaff44ca5a am aaecf93b: Merge "Doc change: add diff report for 16." into jb-dev
* commit 'aaecf93bf952471d004918fabfc3021f9c937c8d':
  Doc change: add diff report for 16.
2012-06-27 01:17:06 -07:00
Dirk Dougherty
1e5d22b74c Doc change: remove an unneeded file. Edits.
Change-Id: I5e89a6e224b0f90207bf3bc625f8d330a28edf37
2012-06-27 01:15:26 -07:00
Dirk Dougherty
aaecf93bf9 Merge "Doc change: add diff report for 16." into jb-dev 2012-06-27 01:14:28 -07:00
Scott Main
ce6c850206 docs: remove empty page and expand system requirements based on URL hash
Change-Id: I9e90af894e6213ef642d3341d169ebb4ec0b8628
2012-06-27 00:55:18 -07:00
Joe Fernandez
c4d1c7f74a am 96e3a7e1: am d9435b37: docs: ADK2 docs - update alternative build instructions
* commit '96e3a7e13e378db86039c5d1c3ffc9e7a3e75418':
  docs: ADK2 docs - update alternative build instructions
2012-06-27 00:03:28 -07:00
Joe Fernandez
96e3a7e13e am d9435b37: docs: ADK2 docs - update alternative build instructions
* commit 'd9435b37371b3b799ed2e8a93f9fba86ca874833':
  docs: ADK2 docs - update alternative build instructions
2012-06-27 00:00:46 -07:00
Joe Fernandez
d9435b3737 docs: ADK2 docs - update alternative build instructions
Change-Id: I395749198a0c1589b71d49638620708e2dc2f6ae
2012-06-26 23:32:03 -07:00
Dirk Dougherty
25f0ec5cdc am 453b6598: am 7547be05: Set up preview SDK for jellybean.
* commit '453b6598d3a1a7c93956bf21a9170ab5d6694031':
  Set up preview SDK for jellybean.
2012-06-26 22:57:12 -07:00
Dirk Dougherty
dbccc9012e Doc change: add diff report for 16.
Change-Id: I38b2e59ac3a553ab7bbde8814e9fb099aa085638
2012-06-26 22:55:30 -07:00
Dirk Dougherty
453b6598d3 am 7547be05: Set up preview SDK for jellybean.
* commit '7547be054261ad8ef9176bf6fa74df80b417ba90':
  Set up preview SDK for jellybean.
2012-06-26 22:53:31 -07:00
Dirk Dougherty
7547be0542 Set up preview SDK for jellybean.
Change-Id: I953cedece036e20f1eb56503a0c8492a0852ddc0
2012-06-26 22:44:38 -07:00
Scott Main
3fd21b562c docs: add info about live wallpaper picker
Change-Id: Idc11d9f091117dec53b19b352d24e97dab2c4bd0
2012-06-26 22:17:10 -07:00
Scott Main
de6082551d am 882c97b5: am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev
* commit '882c97b59a8ef89ff8efa9064829f8014b9a7638':
  docs: add api overview for jb
2012-06-26 21:59:44 -07:00
Scott Main
882c97b59a am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev
* commit 'cdb3f9c45b97a64380f044c6b8c1863c1ba58b6a':
  docs: add api overview for jb
2012-06-26 21:56:17 -07:00
Scott Main
cdb3f9c45b Merge "docs: add api overview for jb" into jb-dev 2012-06-26 21:54:08 -07:00
Scott Main
60dd520d37 docs: add api overview for jb
Change-Id: Ibb916138026bb13bb424c826fe8faa563c71bf94
2012-06-26 21:41:25 -07:00
Dianne Hackborn
ca6f644e4e Fix build.
Change-Id: I9e363c1c01716d2eee7a4339690d285dc92a2d32
2012-06-26 19:08:57 -07:00
Dianne Hackborn
0e5416f661 Merge "Use two fingers to work some magic..." 2012-06-26 18:16:01 -07:00
Robert Ly
19a53dc66e am ea53ebc8: am aa16a2e0: Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev
* commit 'ea53ebc8ddc92fce146513203e5fbef800d2b39d':
  docs: remove graphics rs docs and restructure existing docs
2012-06-26 18:04:16 -07:00
Robert Ly
ea53ebc8dd am aa16a2e0: Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev
* commit 'aa16a2e055737869609ce52e563b9175607ae52d':
  docs: remove graphics rs docs and restructure existing docs
2012-06-26 18:01:36 -07:00
Robert Ly
aa16a2e055 Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev 2012-06-26 17:58:57 -07:00
Robert Ly
864090eeaa docs: remove graphics rs docs and restructure existing docs
Change-Id: I8603c827095143327053e8eba855177ec466a948
2012-06-26 17:51:19 -07:00
Mike Lockwood
68ff8cbc38 am 1524e625: am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev
* commit '1524e625067da52e1365e4f939d4683edeea2fd5':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
2012-06-26 17:01:53 -07:00
Mike Lockwood
1524e62506 am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev
* commit '7017d51e147a0f6ed2370fb79c656c9726304131':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
2012-06-26 16:59:07 -07:00
Scott Main
899825c55e am 32ef7ef6: am 947ce39e: Merge "docs: add landing for gcm" into jb-dev
* commit '32ef7ef6c8ced560211a3efe5fddc435a2e58916':
  docs: add landing for gcm
2012-06-26 16:58:38 -07:00
Mike Lockwood
7017d51e14 Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 2012-06-26 16:57:02 -07:00
Scott Main
32ef7ef6c8 am 947ce39e: Merge "docs: add landing for gcm" into jb-dev
* commit '947ce39e5648851a5a49e71e22d187402ff1337d':
  docs: add landing for gcm
2012-06-26 16:55:52 -07:00
Scott Main
947ce39e56 Merge "docs: add landing for gcm" into jb-dev 2012-06-26 16:53:44 -07:00
Joe Fernandez
6d626725b9 am bcfeefa0: am 3632af39: Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev
* commit 'bcfeefa09479c518d492aa35947c6f85d1af29a0':
  docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1
2012-06-26 16:50:19 -07:00
Joe Fernandez
5a119df462 am 3e975309: am 623898f0: Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev
* commit '3e975309bfff260f7e8c9b75b2c802fd2c442dec':
  docs: GL Tracer, Device Monitor Tools for SDK r20
2012-06-26 16:50:16 -07:00
Joe Fernandez
bcfeefa094 am 3632af39: Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev
* commit '3632af395c26951393f7e5289510c701c8d9f00b':
  docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1
2012-06-26 16:47:28 -07:00
Joe Fernandez
3e975309bf am 623898f0: Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev
* commit '623898f099d8ab99f638fbd8062f3c227800fdf5':
  docs: GL Tracer, Device Monitor Tools for SDK r20
2012-06-26 16:47:26 -07:00
Robert Ly
93b4fbef19 docs: add landing for gcm
Change-Id: Icfe158670c0a07a6dffed496a444e49b5c5ef926
2012-06-26 16:46:21 -07:00
Joe Fernandez
3632af395c Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev 2012-06-26 16:45:31 -07:00
Joe Fernandez
623898f099 Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev 2012-06-26 16:45:12 -07:00
Dianne Hackborn
5359bc38a2 am 2e8295ce: am 3bb98aec: Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev
* commit '2e8295ce1861d8284f16e0f0f80475db0ec2983f':
  Fix issue #6730064: When turning off Nakasi, it very often...
2012-06-26 16:40:48 -07:00
Dianne Hackborn
2e8295ce18 am 3bb98aec: Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev
* commit '3bb98aec9344af1299b90d1567b4443e4d50cc91':
  Fix issue #6730064: When turning off Nakasi, it very often...
2012-06-26 16:38:00 -07:00
Dianne Hackborn
3bb98aec93 Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev 2012-06-26 16:36:36 -07:00
Mike Lockwood
1e855d98aa MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
Bug: 6684451

Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-06-26 16:33:05 -07:00