tree 91a8d5933cc57dd34e92d913dfc261ed3d1855b4
parent 3364006cbe6b4fd8a5e7d3a735ee4998a489b549
parent 681b3c9fd0ecf378e054e0c039c6085844705a9c
author Qiwen Zhao <zhao@google.com> 1447974245 +0000
committer android-build-merger <android-build-merger@google.com> 1447974245 +0000

Merge commit \'f47259b18492c921445d9e437a9f9ed11c52fac6\' into mnc-dr2-dev-plus-aosp
am: 681b3c9fd0

* commit '681b3c9fd0ecf378e054e0c039c6085844705a9c':
  applypatch: Support flash mode.