Commit Graph
44 Commits
Author SHA1 Message Date
The Android Open Source ProjectandAndroid Git Automerger 1bdd5b7e74 am 51ffaf54: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '51ffaf54a56441bba053d37a00122761c3a18f16':
  recovery: sleep after writing partition and closing it
2013-07-11 11:49:43 -07:00
The Android Open Source ProjectandAndroid Git Automerger f5edbd107a am e352c88f: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e352c88fbcfd917f6614597364d2e550aa691e79':
  recovery: write partitions more conservatively
  recovery: try to write EMMC partitions more reliably
2013-07-11 10:17:05 -07:00
The Android Open Source Project 51ffaf54a5 Reconcile with jb-mr2-release - do not merge
Change-Id: Id35004f465f5152c1de0796eb66989f234185208
2013-07-11 08:22:20 -07:00
The Android Open Source Project e352c88fbc Reconcile with jb-mr2-release - do not merge
Change-Id: Ib99b7cd6aede63006c91be2635112e16dd0f2b24
2013-07-09 17:12:56 -07:00
The Android Open Source ProjectandAndroid Git Automerger 1fca2650ed am 27f31606: (-s ours) am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '27f31606390eeed50d27f2c243dfbfe79e8b5ae2':
2012-11-06 12:23:57 -08:00
The Android Open Source ProjectandAndroid Git Automerger 27f3160639 am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'aa0dbb25a0ae51a8e53018fe05bf59164d9804cb':
2012-11-06 12:21:06 -08:00
The Android Open Source Project aa0dbb25a0 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ibef4c059b7a7e055fe562c60656a9f7f7de4841a
2012-11-06 12:16:04 -08:00
The Android Open Source ProjectandAndroid Git Automerger 2b44a56326 am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'd0d4d44d344779e59ee196637bbc745d68d70677':
2012-10-10 09:45:39 -07:00
The Android Open Source Project d0d4d44d34 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I3afa60bf8978d750c7072128e9f5e87c5d624b36
2012-10-10 09:43:44 -07:00
The Android Open Source ProjectandAndroid Git Automerger 3abfe0911e am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '2c3d1d83d5f28160baa5cbec782d518fa186af73':
2012-10-09 07:29:50 -07:00
The Android Open Source Project 2c3d1d83d5 Reconcile with jb-mr1-release - do not merge
Change-Id: I692d63796f64702243898ae1d20d8ce073dc15e6
2012-10-09 07:28:01 -07:00
The Android Open Source ProjectandAndroid Git Automerger 92b466f883 am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '6cc3ded278818e2897459bdfdc5a5fb4b9ef3071':
2012-09-26 10:07:44 -07:00
The Android Open Source Project 6cc3ded278 Reconcile with jb-mr1-release - do not merge
Change-Id: I887d27a16a0713ca92f3b2ebc570033cdb8759fb
2012-09-26 09:05:47 -07:00
The Android Open Source ProjectandAndroid Git Automerger 62831de1be am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '15eaee40a19c0d7391b5f209e4336e889be43297':
  tweak recovery text images
  localization for recovery messages
2012-09-20 12:48:50 -07:00
The Android Open Source Project 15eaee40a1 Reconcile with jb-mr1-release - do not merge
Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba
2012-09-20 10:34:51 -07:00
The Android Open Source ProjectandAndroid Git Automerger 7ae6e20201 am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '74a806e5efbfd4a37725f2f1e193c3c2eb973fb7':
  fix format of installing_text
2012-09-06 09:12:01 -07:00
The Android Open Source Project 74a806e5ef Reconcile with jb-mr1-release - do not merge
Change-Id: Ia9cde557f8e6abaf0935e6b238eb956be09c12ca
2012-09-06 07:52:40 -07:00
The Android Open Source Project 5f4eeec23c Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I66ce5e9ca22d4aecb694bf8814fbf3404fb0013b
2012-05-16 08:39:57 -07:00
The Android Open Source ProjectandAndroid Git Automerger 53013c4645 am 62947db5: am 37d0f260: Reconcile with ics-mr1-release
* commit '62947db579fa7acc9ee01d71f3aeb30add3df260':
2012-02-01 10:03:13 -08:00
The Android Open Source ProjectandAndroid Git Automerger 62947db579 am 37d0f260: Reconcile with ics-mr1-release
* commit '37d0f260a55cfbe2b275131b12b2b5b824955e51':
2012-02-01 10:00:24 -08:00
The Android Open Source Project 37d0f260a5 Reconcile with ics-mr1-release
Change-Id: Id3629feac35e35922942a6d04e741e72b95fded4
2012-02-01 08:49:25 -08:00
The Android Open Source ProjectandAndroid Git Automerger 4029fb37ad am 9fc3e3c8: Reconcile with ics-mr1-release
* commit '9fc3e3c8a6a5f2f82d5712805e90a9c89f914efa':
2011-12-09 14:57:25 -08:00
The Android Open Source Project 9fc3e3c8a6 Reconcile with ics-mr1-release
Change-Id: I74a51ed7639683e0ab67c922b954eb1391dd2a49
2011-12-08 10:21:25 -08:00
The Android Open Source Project 0890a0ce8e Reconcile with ics-mr1-release
Change-Id: I29287109bc555579a9c66b586a3636ba41be5c57
2011-10-31 13:19:06 -07:00
The Android Open Source Project 28a08efe15 Reconcile with honeycomb-release
Change-Id: I1205ca405fdaf586ebc349fbe83969e9694fab60
2011-05-20 12:45:51 -07:00
The Android Open Source ProjectandAndroid Git Automerger 42cfc2cc05 am 60faafcf: merge from open-source master
Merge commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692'

* commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692':
2010-06-30 15:54:38 -07:00
The Android Open Source Project 60faafcf01 merge from open-source master
Change-Id: I9d0122dbf1a9c2bd1898c41766c5bf4320f2313a
2010-06-30 15:51:09 -07:00
The Android Open Source ProjectandAndroid Git Automerger 2e068dc330 am da846fcf: am 4c382b13: reconcile main tree with open-source eclair
Merge commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75'

* commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75':
  android-2.1_r1 snapshot
2010-02-05 14:09:04 -08:00
The Android Open Source ProjectandAndroid Git Automerger da846fcf1b am 4c382b13: reconcile main tree with open-source eclair
Merge commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0' into eclair-plus-aosp

* commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0':
  android-2.1_r1 snapshot
2010-02-05 08:22:49 -08:00
The Android Open Source Project 4c382b1365 reconcile main tree with open-source eclair 2010-02-05 08:09:31 -08:00
The Android Open Source Project b551724ceb reconcile android-2.1_r1 snapshot 2010-01-29 14:07:31 -08:00
The Android Open Source Project b765729081 android-2.1_r1 snapshot 2010-01-12 15:18:06 -08:00
The Android Open Source Project 36a9c1e530 Merge branch 'open_source_no_contributions' into google_internal 2009-03-29 08:55:03 -07:00
The Android Open Source Project b2b467c757 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
The Android Open Source Project 73e8e9ba08 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:36 -07:00
The Android Open Source Project c24a8e688a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project ffb48f64fe auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project d4ae69739e auto import from //depot/cupcake/@132589 2009-03-03 14:03:51 -08:00
The Android Open Source Project 15bb56d89a auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
The Android Open Source Project 8b7334b3c2 auto import from //branches/cupcake/...@130745 2009-02-10 15:43:56 -08:00
The Android Open Source Project 6d12e0d6f8 Merge branch 'cupcake' 2009-01-09 18:03:37 -08:00
The Android Open Source Project 928d471ef2 auto import from //branches/cupcake/...@125939 2009-01-09 17:50:54 -08:00
The Android Open Source Project ff3d93821e Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project 23580ca27a Initial Contribution 2008-10-21 07:00:00 -07:00