OSDN Git Service

Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com...
authorPaul Soulos <psoulos@google.com>
Wed, 12 Nov 2014 00:30:41 +0000 (00:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Nov 2014 00:30:41 +0000 (00:30 +0000)
commitf20aeaa0333ee9d550adbad4c9e901d3db0bd48c
treec0b0cc422f78aad9bd0f0f0e157fca9669228360
parente323ff0653b07bca0c665be8f3fc5415e27bd2c7
parent8c5f5fbdfff8e24ccd753c0d17a43f644b06b80a
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp