OSDN Git Service

merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
authorThe Android Automerger <android-build@google.com>
Sat, 10 May 2014 12:50:50 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 10 May 2014 12:50:50 +0000 (05:50 -0700)
commit2af0dcc31c60fd13177c5fedfc624310b31bfce1
tree924ca4133572662d32eb99f4140584e56c6a2e47
parent745aabad1d2fa690c31a6f43f0ba16f9ab371170
parent9ed663782fc310d4cc32749f789fa238dcbf55b8
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170