Commit Graph

10688 Commits

Author SHA1 Message Date
Katie McCormick
1f1524395d am 65cc8b78: Network sample: fix typo in manifest
* commit '65cc8b78a8a3594911772c665d77fd6030d9fd51':
  Network sample: fix typo in manifest
2013-01-04 16:35:53 -08:00
Katie McCormick
65cc8b78a8 Network sample: fix typo in manifest
Change-Id: I5731dbb89d17bd15bc72a2f140bca2915976b4c1
2013-01-04 16:04:23 -08:00
Xavier Ducrohet
07d7362394 am bf323d72: Update platform tools rev to 16.0.2
* commit 'bf323d72b7db944a4a0c8794f28e03367abd8c99':
  Update platform tools rev to 16.0.2
2013-01-02 13:00:56 -08:00
Xavier Ducrohet
bf323d72b7 Update platform tools rev to 16.0.2
Change-Id: I814294bc9374f6194671eb173bd9942908db3848
2013-01-02 12:28:36 -08:00
Joe Malin
fa8f593a2a am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
* commit '50600ba5d68e1e002bd8b6ca646be93f922d37ab':
  Android Training: Threads sample app
2012-12-13 11:03:10 -08:00
Joe Malin
50600ba5d6 am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
* commit 'a525bf719545fc315d03c1c6ee74f61e8dda03e0':
  Android Training: Threads sample app
2012-12-13 11:00:59 -08:00
Joe Malin
a525bf7195 am 1e083591: am 2c063c88: Android Training: Threads sample app
* commit '1e083591aed6b77408f6fce363bd48e63db92ed4':
  Android Training: Threads sample app
2012-12-13 10:58:59 -08:00
Joe Malin
1e083591ae am 2c063c88: Android Training: Threads sample app
* commit '2c063c889aa816e0de91bf17fdc0c78f48d5e2d0':
  Android Training: Threads sample app
2012-12-13 10:57:14 -08:00
Dirk Dougherty
4b5dc0ce4d am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev
* commit '01b1a8739b338f50393e7c113d3a168710b45679':
  Add ko and ru to validLangs.
2012-12-13 10:52:28 -08:00
Dirk Dougherty
01b1a8739b Merge "Add ko and ru to validLangs." into jb-mr1-dev 2012-12-13 10:34:26 -08:00
Dirk Dougherty
22c9415195 Add ko and ru to validLangs.
Change-Id: I40d1a8e82d4b30cc2e787826252a85161e0157d8
2012-12-13 10:00:30 -08:00
Joe Malin
2c063c889a Android Training: Threads sample app
Change-Id: I6d07871acad31807eb4bf06aa8406b722320680c
2012-12-12 10:47:58 -08:00
Dirk Dougherty
7377374bf6 am 7ca28063: Add redirect for IAB v3 restructure.
* commit '7ca280639960cc18ad8a9b398c1e059df27597b5':
  Add redirect for IAB v3 restructure.
2012-12-10 09:25:25 -08:00
Dirk Dougherty
7ca2806399 Add redirect for IAB v3 restructure.
Change-Id: I65ccc6767408977a9756b217168b819b71816c1f
2012-12-09 17:09:26 -08:00
Dianne Hackborn
613e19b740 SDK Only: Fix search interaction with various samples.
These were broken where pressing back would not clear the
search filter.

Change-Id: Iafd4a497a31a9689efabe7d92f44618a5e8dc80c
2012-12-05 15:17:31 -08:00
Dirk Dougherty
51b6b20fe6 am 6d198012: Redirects /guide/google to /google/.
* commit '6d198012a9150521c08af28c669b5b589f0465ac':
  Redirects /guide/google to /google/.
2012-12-02 17:56:36 -08:00
Dirk Dougherty
6d198012a9 Redirects /guide/google to /google/.
Change-Id: I5018200bb8717e69d2485ce4d1b8804a1d90e2c8
2012-12-02 17:25:10 -08:00
Xavier Ducrohet
8325f80ba4 am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1
* commit '0e61ea6f3967846d0796d533f98cad0fb91f3d3d':
  Move plat-tools SDK component rev to 16.0.1
2012-11-30 13:57:31 -08:00
Xavier Ducrohet
0e61ea6f39 Move plat-tools SDK component rev to 16.0.1
Change-Id: Id04fb83c09190bdb1a1b0c685c2c7db3ada8c47d
2012-11-30 13:54:11 -08:00
kmccormick@google.com
6eed638a9c am ab85a2a5: am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs
* commit 'ab85a2a59a1fd2dad2ad27d5b8853b589d942e2f':
  Doc change: sample app for Notifications class
2012-11-27 11:27:33 -08:00
kmccormick@google.com
ab85a2a59a am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs
* commit 'd77ac2b955ff5adf68f7437bb286c3e02430f896':
  Doc change: sample app for Notifications class
2012-11-27 11:25:27 -08:00
kmccormick@google.com
d77ac2b955 am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs
* commit '80e0ac6abc4a58d7442cc1d0707e77f4636ea0bd':
  Doc change: sample app for Notifications class
2012-11-27 11:22:40 -08:00
kmccormick@google.com
80e0ac6abc am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs
* commit '70db2b6bcebfd7c34533114b0dab00d2a821d9c5':
  Doc change: sample app for Notifications class
2012-11-27 11:19:36 -08:00
&& repo sync -j8
70db2b6bce Merge "Doc change: sample app for Notifications class" into jb-dev-docs 2012-11-27 10:53:04 -08:00
&& repo sync -j8
fc0d593056 Doc change: sample app for Notifications class
Change-Id: Iaa45156f333e5b8e9bc9cc596900835540ff138e
2012-11-26 16:56:34 -08:00
Scott Main
892fae1646 am f394e166: docs: update redirects for articles
* commit 'f394e166a0f96c7851445c2a38a9457b9581ddc4':
  docs: update redirects for articles
2012-11-16 09:52:23 -08:00
Scott Main
f394e166a0 docs: update redirects for articles
Change-Id: Ia2db76f0b9cc07878ecdc1e673cd1ae376b0447f
2012-11-16 08:57:44 -08:00
Scott Main
763f9b7aa8 am e1e1a999: docs: add redirects for best practices pages that moved to training
* commit 'e1e1a999e8c71604a0fa30adb1096d3645e8ba14':
  docs: add redirects for best practices pages that moved to training
2012-11-15 18:25:55 -08:00
Scott Main
e1e1a999e8 docs: add redirects for best practices pages that moved to training
Change-Id: I0dd79fb863d50b0dd2f0f7d53babe345888f0f78
2012-11-15 17:47:44 -08:00
Scott Main
95715d2208 am 42801496: docs: a few bonus redirects for dac
* commit '42801496cff122e26abb34c09b79fa60135a02ea':
  docs: a few bonus redirects for dac
2012-11-14 11:32:44 -08:00
Scott Main
42801496cf docs: a few bonus redirects for dac
Change-Id: I01743d0032ebe707125121e84d741d4d39ca5540
2012-11-14 09:59:12 -08:00
Scott Main
cd18b80902 am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
* commit '2df7c91d5f93a91f23c54239de5ac49d06ee1554':
  docs: redirect next steps to building first app class
2012-11-12 19:52:49 -08:00
Scott Main
2df7c91d5f am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
* commit '87525f600943f36697c85c22555463bb199afc2f':
  docs: redirect next steps to building first app class
2012-11-12 19:50:56 -08:00
Scott Main
87525f6009 am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
* commit '09d8f21c0b9531d1d2615a737b256da4f29d27bf':
  docs: redirect next steps to building first app class
2012-11-12 19:47:51 -08:00
Scott Main
09d8f21c0b am e242276c: docs: redirect next steps to building first app class
* commit 'e242276c5b021c6219b31e9a40e126b633f15deb':
  docs: redirect next steps to building first app class
2012-11-12 19:45:49 -08:00
Andy Stadler
e9a0634689 am 18bc76ab: Cleanup eclipse .classpath for Gallery2
* commit '18bc76ab25b105af2d26c5456e0937e139b3203b':
  Cleanup eclipse .classpath for Gallery2
2012-11-12 16:09:36 -08:00
Andy Stadler
18bc76ab25 Cleanup eclipse .classpath for Gallery2
A couple of minor fixes to make eclipse happy.

Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
2012-11-12 14:40:23 -08:00
Scott Main
e242276c5b docs: redirect next steps to building first app class
Change-Id: I2cc922573021a6c69d8830ab886b537df28a2a62
2012-11-07 17:47:47 -08:00
The Android Open Source Project
7cb8e4ae66 Reconcile with jb-mr1-release - do not merge
Change-Id: I36e5d6ccd61dc24a395656f7fdf9a6ca3781a331
2012-11-07 10:19:43 -08:00
The Android Automerger
f893fe7ac1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 18:03:53 -08:00
Xavier Ducrohet
9350dd44e3 am 85c1f088: revert API 17 system image to rev 1.
* commit '85c1f0880d5d8ac8fab41dc141eba3e5495bedcd':
  revert API 17 system image to rev 1.
2012-11-06 17:09:19 -08:00
Xavier Ducrohet
85c1f0880d revert API 17 system image to rev 1.
Change-Id: I6e28fd4567f8c99eaca86b328d10d616317cf5d8
2012-11-06 15:27:49 -08:00
The Android Open Source Project
f2701a8a6e Reconcile with jb-mr1-release - do not merge
Change-Id: I3cd40c84fd37293ca96b5c35bea6c34871bf7659
2012-11-06 13:26:41 -08:00
The Android Automerger
5b96c40589 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 13:13:21 -08:00
The Android Open Source Project
4844b2068d Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ib34e324ad00ff6f1b970c073ed468a45af88280d
2012-11-06 11:20:18 -08:00
Katie McCormick
130b7e43f9 Merge "cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2" into jb-mr1-dev 2012-11-06 09:29:58 -08:00
The Android Automerger
1c9c1edfcb merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:38:39 -08:00
Xavier Ducrohet
529393a5da Update API text file.
Change-Id: I9513b88373e893d8f16092d1735e6eb0bb7ea34b
2012-11-05 17:09:52 -08:00
Dianne Hackborn
75dbc3984c Merge "Set correct targetSdkVersion for DevelopmentSettings" into jb-mr1-dev 2012-11-05 16:50:14 -08:00
Xavier Ducrohet
65098d0da5 Move support lib to r11
Change-Id: I714cefd462e30d4a975be40e0f9f8f14cb74fe26
2012-11-05 16:45:03 -08:00