tree 92cbf6ed20078148572c5beec0833f61c0fc296b
parent f7f66c5cfa9e6f7dd56edd3e30d95d64bcd22c17
parent af11e9a60b569ce2d9655648356ea32d0d9a375d
author Jean-Baptiste Queru <jbq@google.com> 1363029789 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029789 -0700

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

* commit 'af11e9a60b569ce2d9655648356ea32d0d9a375d':