tree a3cf3552a5ac7e454cf01bdcd41b576214556e57
parent 4e0c8cc8dfca9f4e2738607f93c5c2d96ffc3674
parent 6cc3ded278818e2897459bdfdc5a5fb4b9ef3071
author The Android Open Source Project <initial-contribution@android.com> 1348679264 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348679264 -0700

am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6cc3ded278818e2897459bdfdc5a5fb4b9ef3071':