OSDN Git Service

Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct...
authorAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Sep 2015 21:37:33 +0000 (21:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Sep 2015 21:37:33 +0000 (21:37 +0000)
commit1c88f605629a5f1647a8af1fdcfe0fb6e3eea847
tree49f056d9bc7974bd57a69ddf2ec084898c5e3d05
parent9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664
parente335472def0e36e7608bdaf1b37ec67c08dfee52
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev