| commit | 54c81104b4ad3ac250770a8d86ec622783669200 | [log] [tgz] |
|---|---|---|
| author | David Herman <davidherman@google.com> | Thu Aug 27 21:32:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:32:00 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 458096c5b88fe52c44c50c4a032afea73c8546c3 [diff] | |
| parent | 9601e49cc3d9051ad7cb25cf20a0d32bad1fb406 [diff] |
am 9601e49c: am a30c86a5: (-s ours) am 6a8935aa: am 7b90f21b: Merge ""Update" and "Step" state now bound together" into studio-1.4-dev automerge: 01af66f automerge: 1f8e5c4 * commit '9601e49cc3d9051ad7cb25cf20a0d32bad1fb406':