OSDN Git Service

am 7a496e7c: am 1b33ff33: Merge "move data wipe to end of OTA package"
authorDoug Zongker <dougz@android.com>
Mon, 12 May 2014 23:28:19 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:19 +0000 (23:28 +0000)
* commit '7a496e7c5b6250b14b1f95db7f9bbcd67b38c10b':


Trivial merge