OSDN Git Service

am 0f0ccf07: Add new software features
authorAdam Lesinski <adamlesinski@google.com>
Thu, 6 Feb 2014 19:30:54 +0000 (19:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 19:30:54 +0000 (19:30 +0000)
* commit '0f0ccf07bad594b618f4fcce9a8f79a5bc188bb3':
  Add new software features


Trivial merge