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

* commit 'ec3aad2e30ead7923f659c197c57f843cc55c913':
  Tightening migration conditions. (Bug 11973614)
This commit is contained in:
Qiwen Zhao
2014-10-23 19:13:36 +00:00
committed by Android Git Automerger

Diff Content Not Available