tree a8a69e79f28a525427f06aa5018efefb38d68fff
parent 15c446b5e5a27fc7657942156776d460cdcbadb2
parent d63dd3c75b2d6d4af2b687e9a58822a983d97acd
author Bart Sears <bsears@google.com> 1419027703 +0000
committer android-build-merger <android-build-merger@google.com> 1419027703 +0000

am a2bd0e55: am 02aca27f: Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-dev
automerge: d63dd3c

* commit 'd63dd3c75b2d6d4af2b687e9a58822a983d97acd':
  Allow OEM to specify <unavailable-feature>.