OSDN Git Service

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
authorAndrew Solovay <asolovay@google.com>
Thu, 12 Jun 2014 18:50:02 +0000 (18:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Jun 2014 18:50:02 +0000 (18:50 +0000)
commitad60891a6ecaf2a5815677b33e96afe7f49ee113
tree6c4f8d3f342bcfc64b527f80359862b0171eab06
parent56dc9a56f89ac73341a41146ff49db656d0d71ae
parent7c9f5529ea07fda43a68f9b5de204cf2b90d1b61
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base