OSDN Git Service

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
authorFilip Gruszczynski <gruszczy@google.com>
Tue, 24 Mar 2015 02:58:54 +0000 (02:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Mar 2015 02:58:54 +0000 (02:58 +0000)
commit90214cd7f5acfb684b0b601816d885549080cac7
tree34bcaad3fc7b33e1ce25dda310fab432aefcb2f5
parentd99c5f6fb694f7c0be5e734fd728fa77b3bff43d
parent6a225edccda80b38f4d249d9befdbcf0769c0446
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base