tree 786c3c4f6a75a9489d11bd768240473a8ef74d11
parent 191ba124991908a09e7935c55296dd39ef0a0964
parent 24bea6a3ef53733ffd1622dfa0bdaeea0a74303a
author Jason Sams <jsams@google.com> 1404343167 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404343167 +0000

am 24bea6a3: Resolve conflicts with AOSP.

* commit '24bea6a3ef53733ffd1622dfa0bdaeea0a74303a':
  Resolve conflicts with AOSP.