tree 41158eb3f49bb1e85ce2280cd349600ddf08420e
parent 4ba492f23b6fb0d5a95174cc194ce04e1497c0d7
parent 1772970fa510b915d7b0006093933278db57f899
author Adam Lesinski <adamlesinski@google.com> 1391715397 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391715397 +0000

am 1772970f: am 0f0ccf07: Add new software features

* commit '1772970fa510b915d7b0006093933278db57f899':
  Add new software features