tree 7e3b0778abacfe37d468cfd01c71b8077f5dbc0d
parent afbfde9f58a7265ad6e8a9e4d3e225f444f4391c
parent 9bf5a42ad3a67e2b08863af6e9a500830bce16fe
author The Android Open Source Project <initial-contribution@android.com> 1370293640 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370293640 -0700

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

* commit '9bf5a42ad3a67e2b08863af6e9a500830bce16fe':