| commit | 525b75c10c2f7efcd704c1e18a8f02042d27dc1c | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Thu Aug 27 20:21:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:21:16 2015 +0000 |
| tree | 8c762641adaf526afc25ba999560dbfe888bbd1c | |
| parent | bebcd7ee91a18e8a54b60f67a25533ebc70e98da [diff] | |
| parent | 5a9e0e8236dcab5e086d95c45e9b0e4ca30da88d [diff] |
am 5a9e0e82: am e56724ba: (-s ours) am 67f0739c: Merge "Block moving when already in progress." into mnc-dev * commit '5a9e0e8236dcab5e086d95c45e9b0e4ca30da88d':