OSDN Git Service

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
authorScott Main <smain@google.com>
Thu, 1 Aug 2013 22:27:46 +0000 (15:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Aug 2013 22:27:46 +0000 (15:27 -0700)
commit68c997c5e746211ad5eed9cb33183428e51f6c0f
tree1886043d19dd04977da8d65e847ffb4986a470ce
parent9eac655fb8cb8bcc1809e1a715ab512dea5a7a82
parente0c02f1d0117aa072e41a866340a6cbc0d1c3772
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base