tree a4b74b7db468aa2df778d50eea94e2620e9ecd57
parent d19db9a7c4427765dddd3210963c4277eee412f2
parent 7c2ea974834b2aa3f416aff4962fdd7bbec8a51f
author The Android Open Source Project <initial-contribution@android.com> 1373323944 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373323944 -0700

am 7c2ea974: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '7c2ea974834b2aa3f416aff4962fdd7bbec8a51f':