tree 887af8a102ee2a9cd679d12eefc2a39f3316aba5
parent 67ee1205b1be15660adda7431d340ec5d2cda57a
parent f02af525738583ca42a3cbfea00b868de7281aeb
author The Android Open Source Project <initial-contribution@android.com> 1386293920 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386293920 +0000

am f02af525: am 7fc7a07b: Merge commit \'252d9030cd4b2e3e6cf13fa33f328eccedb5e26c\' into HEAD

* commit 'f02af525738583ca42a3cbfea00b868de7281aeb':