tree cba62d0d64153aa2169651696bc238591341d679
parent 9f0c4b4e12922b4cb3a4328d140b5cece73bb95d
parent ec3aad2e30ead7923f659c197c57f843cc55c913
author Qiwen Zhao <zhao@google.com> 1414091616 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414091616 +0000

am ec3aad2e: (-s ours) Merge commit \'d5c6745b\' into klp-dev-plus-aosp

* commit 'ec3aad2e30ead7923f659c197c57f843cc55c913':
  Tightening migration conditions. (Bug 11973614)