Commit Graph
19 Commits
Author SHA1 Message Date
Qiwen Zhaoandandroid-build-merger 348355ebe9 Merge commit \'8f90389966fabf532b24741d49245215279533e1\' into mnc-dr2-dev-plus-aosp
am: a550e6b412

* commit 'a550e6b4122108fa2db438afcfd7d40386b71b0b':
  recovery: Allow "Mount /system" for system_root_image.
2015-11-19 23:04:11 +00:00
Qiwen Zhaoandandroid-build-merger 6824e1d1b7 Merge commit \'32ac97675bade3681203c46d001f76b11a359fd5\' into mnc-dr2-dev-plus-aosp
am: 312f7c71f4

* commit '312f7c71f4a71feb0e8c3d202164ddeefa0ec661':
  applypatch: Fix the checking in WriteToPartition().
2015-11-19 23:04:08 +00:00
Qiwen Zhaoandandroid-build-merger 61ff9a511b Merge commit \'f47259b18492c921445d9e437a9f9ed11c52fac6\' into mnc-dr2-dev-plus-aosp
am: 681b3c9fd0

* commit '681b3c9fd0ecf378e054e0c039c6085844705a9c':
  applypatch: Support flash mode.
2015-11-19 23:04:05 +00:00
Qiwen Zhaoandandroid-build-merger 3364006cbe Merge commit \'3b199267d6d4c279cbef3286a74e16bf92dd8d8a\' into mnc-dr2-dev-plus-aosp
am: 06ec3bab56

* commit '06ec3bab56371fee051326cbd5f2b72a53462d29':
  updater: libapplypatch needs libbase now.
2015-11-19 23:04:02 +00:00
Qiwen Zhaoandandroid-build-merger a259540f59 Merge commit \'27604fcbee0010b800bfc16b5bf7a48c365c2cf3\' into mnc-dr2-dev-plus-aosp
am: 8b254cfc3c

* commit '8b254cfc3ccb67953b62412b0a453f382907b841':
  applypatch: Refactor strtok().
2015-11-19 23:03:58 +00:00
Qiwen Zhao a550e6b412 Merge commit '8f90389966fabf532b24741d49245215279533e1' into mnc-dr2-dev-plus-aosp 2015-11-19 14:56:59 -08:00
Qiwen Zhao 312f7c71f4 Merge commit '32ac97675bade3681203c46d001f76b11a359fd5' into mnc-dr2-dev-plus-aosp 2015-11-19 14:56:45 -08:00
Qiwen Zhao 681b3c9fd0 Merge commit 'f47259b18492c921445d9e437a9f9ed11c52fac6' into mnc-dr2-dev-plus-aosp 2015-11-19 14:56:28 -08:00
Qiwen Zhao 06ec3bab56 Merge commit '3b199267d6d4c279cbef3286a74e16bf92dd8d8a' into mnc-dr2-dev-plus-aosp 2015-11-19 14:56:14 -08:00
Qiwen Zhao 8b254cfc3c Merge commit '27604fcbee0010b800bfc16b5bf7a48c365c2cf3' into mnc-dr2-dev-plus-aosp 2015-11-19 14:56:00 -08:00
Jesse ZhaoandAndroid Git Automerger 670a0c6fe9 am 0257d107: am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.
* commit '0257d107f2039e24e4fbdd98d7536f402628bd78':
  Bump up max_map_count value.
2015-02-27 00:03:58 +00:00
Jesse ZhaoandAndroid Git Automerger 0257d107f2 am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.
* commit '71c454293118c51487a62c5d7c4da6262eae691c':
  Bump up max_map_count value.
2015-02-26 23:57:04 +00:00
Jesse ZhaoandAndroid Git Automerger 71c4542931 am f66bf339: am 3e91f691: Bump up max_map_count value.
* commit 'f66bf33956eebba26bedc7f098dedc8a2c1cf942':
  Bump up max_map_count value.
2015-02-26 23:34:49 +00:00
Jesse ZhaoandAndroid Git Automerger f66bf33956 am 3e91f691: Bump up max_map_count value.
* commit '3e91f691a6bf6b154ea98982b073e84e86328baf':
  Bump up max_map_count value.
2015-02-26 23:20:35 +00:00
Jesse ZhaoandTao Bao 3e91f691a6 Bump up max_map_count value.
Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
(cherry picked from commit 5bf74b238b)
2015-02-25 22:47:26 +00:00
Jesse Zhao 1df64d3278 Initialize stashbase even stash_max_blocks = 0
Change-Id: I480c02ffedd811f4dda9940ef979a05ff54f1435
Bug: 19410117
2015-02-17 17:09:29 -08:00
Jesse ZhaoandAndroid Git Automerger ec4e95407e am 465e8702: am 5bf74b23: Bump up max_map_count value.
* commit '465e8702912d06b7207878eb38b0df6f56f8bbb6':
  Bump up max_map_count value.
2015-01-15 22:17:37 +00:00
Jesse ZhaoandAndroid Git Automerger 465e870291 am 5bf74b23: Bump up max_map_count value.
* commit '5bf74b238b402eaaf8c5bd1663fe4d592e59421f':
  Bump up max_map_count value.
2015-01-15 19:21:03 +00:00
Jesse Zhao 5bf74b238b Bump up max_map_count value.
Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
2015-01-08 16:02:46 -08:00