am f2c509a8: am 310da35c: Merge "Follow up API signature change" into lmp-dev

* commit 'f2c509a81ef107e6c71dc6804417469d12c94fca':
main
Yohei Yukawa 2015-03-20 23:29:35 +00:00 committed by Android Git Automerger
commit 5603bcb264

Diff Content Not Available