tree 0fd31cd73e5dc9ae3160612e58b5570a2b884b67
parent b8838e6bf207ed2677ab4b3bef79f685193f175e
parent e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2
author Elliott Hughes <enh@google.com> 1427123279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427123279 +0000

am e944944f: Merge "Add "Apply update from sdcard" to default recovery image."

* commit 'e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2':
  Add "Apply update from sdcard" to default recovery image.