OSDN Git Service

am 84ef15db: am f6335156: (-s ours) am 1578357d: Merge "Check user state after cleari...
authorAmith Yamasani <yamasani@google.com>
Thu, 27 Aug 2015 16:44:06 +0000 (16:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:44:06 +0000 (16:44 +0000)
* commit '84ef15dbc088b1226413942d64448bf947bfa18a':


Trivial merge