| commit | 18fd4b49f3d9dadfa90bf5fe45cdfd2b6c885f21 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri May 02 01:26:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 01:26:29 2014 +0000 |
| tree | 4c775c405cd5cf3996ef9567ad82e412818ea940 | |
| parent | d29201422b13a3f3aba6143a7dc9c45e2d8d8376 [diff] | |
| parent | 6a221523180e64cbf921992a1e13cf042a50f0c6 [diff] |
am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master" * commit '06dec5656d75345566fd31a2cfc6bd5c84bf41de': Clean up some terminology related to interactive state.