tree 7403a641121a22430470b36d1032ef328918523b
parent 41cc67f9282657bfcf6ed2b565ee42ed7a40ee6c
parent 4fe497660c2e939300dc5b743d662aef458b1726
author Brian Carlstrom <bdc@google.com> 1390942474 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390942474 +0000

am 4fe49766: Merge "Delete some pointless and invalid code."

* commit '4fe497660c2e939300dc5b743d662aef458b1726':
  Delete some pointless and invalid code.