tree 14c292ad650b3835ffb1ed2b60ca1a6cdb67e4f7
parent f0014a6b259a10c9a79054ec3613ad510c23b3cb
parent 087328986922a36bef6f1829790e0840516405a4
author The Android Open Source Project <initial-contribution@android.com> 1369840232 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369840232 -0700

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

* commit '087328986922a36bef6f1829790e0840516405a4':