tree 12b08829177cdc3726c72b8e16b4723e7bba0be4
parent 59eaeed5fabc27942d62327fa460ebb8bd2f3822
parent 92cf355308ffb28f8a460d69915ca5955016a632
author The Android Open Source Project <initial-contribution@android.com> 1368708502 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368708502 -0700

am 92cf3553: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '92cf355308ffb28f8a460d69915ca5955016a632':