| commit | b515af45ea1f6d02d0cfa59a57ec715fd21c97be | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Oct 29 07:07:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:07:46 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 56335b708766f64203133a3f3d1e43dd745e0bc3 [diff] | |
| parent | 39363a4e113a35060cb4299806459463d4a75177 [diff] |
am 39363a4e: am ec3aad2e: (-s ours) Merge commit \'d5c6745b\' into klp-dev-plus-aosp * commit '39363a4e113a35060cb4299806459463d4a75177': Tightening migration conditions. (Bug 11973614)