tree 1eed823ec3db2ce956719688eed7377fe903e95c
parent 883462790b7696f85f792aa1863ea8998ec94424
parent 3e78f477c237e3ac9da58b698893b482c4baefa4
author The Android Open Source Project <initial-contribution@android.com> 1348170543 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348170543 -0700

am 3e78f477: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3e78f477c237e3ac9da58b698893b482c4baefa4':