OSDN Git Service

merge in master-release history after reset to 87b6b24f863e952bec9be7a5cb8415c195744b18
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:21:23 +0000 (07:21 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:21:23 +0000 (07:21 -0700)
commitc64d2a5b7779be797ce4bdaa8ba5eb3e3165fb33
tree1e633735cdaa84b36e184bd38d38c2d0cded9b73
parent87b6b24f863e952bec9be7a5cb8415c195744b18
parent618f9d8beed339b461e236d50d15a0aa35063d1f
merge in master-release history after reset to 87b6b24f863e952bec9be7a5cb8415c195744b18