tree 713ecc87fc64618eccf09ccd7c7371b927847908
parent e43949d06d74b564c154126d1f345e570815c411
parent f0614ae955e855d93b443ba8b17a636dcb9b9f8b
author Tom O'Neill <tomo@google.com> 1409872920 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409872920 +0000

am efb3b23f: am 15674b91: am b1a1f355: Merge "Keep LMP from breaking KitKat API" into lmp-dev

* commit 'efb3b23f7ef672ae24dd655950e0fedfe22c5066':
  Keep LMP from breaking KitKat API