OSDN Git Service

merge in master-release history after reset to ec00884cac216d1cb79556ca23b21ce55e35af3e
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:41 +0000 (07:22 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:41 +0000 (07:22 -0700)
commita5d6875887a63797711093a169e7ef19c5a1ab3b
treea14c399765f8468f61604361f3c7cfe01579e7dd
parentec00884cac216d1cb79556ca23b21ce55e35af3e
parent7971a84be3e6cd8bf3e4dae31f307a7fb13fb302
merge in master-release history after reset to ec00884cac216d1cb79556ca23b21ce55e35af3e