tree cf26ebe71d5f57918e0fb1f73dd233b90a678cdb
parent bbc499415c624ee833a3ee82973d6d0355441e3f
parent 9353e1a2b2e8f02377c3f73565964ffb0927c776
author Prashant Malani <pmalani@google.com> 1405626932 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405626932 +0000

am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional