tree 88ded1977b73276f93db557f58128bbb989171ca
parent d5de3602d72ca8d59c34eeff0d5d965bd7ec111f
parent 4e9fb84063a2ad84df45ade41d301ec3aaf06160
author The Android Open Source Project <initial-contribution@android.com> 1348679259 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348679259 -0700

am 4e9fb840: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4e9fb84063a2ad84df45ade41d301ec3aaf06160':