| commit | f0e79e461a34fdec9c5067a6772311fd420f4481 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu May 01 23:29:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 01 23:29:13 2014 +0000 |
| tree | 72435ff280ecdf05dc41e0e667cf0074210cc237 | |
| parent | 06a1a845075c728024234b2cb8859c20a6472955 [diff] | |
| parent | a675d009b3fa826950af353305aa863db6066b10 [diff] |
am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev * commit '7f6ab17d414726868563105cd995b37dd519320b': Clean up some terminology related to interactive state.