tree 32cdc7bdb96d2ab5a6aef3fa930220d1344d9c66
parent 068499111c173fdd9869e7dbe5b9de857aca1c2d
parent 53ec037f9eb0e29f958faa334cf23c35f079eb85
author David Friedman <dmail@google.com> 1423882249 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423882249 +0000

am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs

* commit '53ec037f9eb0e29f958faa334cf23c35f079eb85':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.