OSDN Git Service

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
authorShawn Willden <swillden@google.com>
Wed, 11 Mar 2015 20:10:03 +0000 (20:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Mar 2015 20:10:03 +0000 (20:10 +0000)
commit0314fa28408205f4153404bc84a1a1e1b395dba3
tree13923c375ca30025cf2aaac3668e283c64cbdb61
parentb8d342da4e16ced2290c1c19b96057e8be5b9318
parent6c2f4484e3c28f77a971743872bb6f01945494f9
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base