tree 5a1cdad3aa0feb9b6a4d11e2924fd84f18749604
parent 83a7149ba95546bc0acfbc7b74e250114f53148d
parent a3fa668449c8009bbfa764de597a130d9f0f682f
author The Android Open Source Project <initial-contribution@android.com> 1360367151 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360367151 -0800

am a3fa6684: (-s ours) Reconcile with jb-mr1.1-release - do not merge

# Via The Android Automerger (2) and The Android Open Source Project (1)
* commit 'a3fa668449c8009bbfa764de597a130d9f0f682f':