OSDN Git Service

am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master"
authorJeff Brown <jeffbrown@google.com>
Fri, 2 May 2014 01:26:29 +0000 (01:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 May 2014 01:26:29 +0000 (01:26 +0000)
commitf347bc39fcbc9836e4914d4a610dadaa93a538d0
treec3cbeb2d7af9bc74d2b5fe9238cbb4f4c86ce34e
parent8af18df299b9d168cc4af0c5e3aaff753780e8c7
parent8822d4befdb30452ad4276b42d89062938b51a1f
am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master"

* commit '06dec5656d75345566fd31a2cfc6bd5c84bf41de':
  Clean up some terminology related to interactive state.