tree 2515648befcc963f26155f60b1caa65063b60a52
parent 2b957503b77c938e0698ffa8904e20c38c408d81
parent 0f0ccf07bad594b618f4fcce9a8f79a5bc188bb3
author Adam Lesinski <adamlesinski@google.com> 1391715054 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391715054 +0000

am 0f0ccf07: Add new software features

* commit '0f0ccf07bad594b618f4fcce9a8f79a5bc188bb3':
  Add new software features