tree de4b9fce9ad3e87543de1a4335f9f1d3d97d426c
parent f53f9c6d3668490f6c68f5c094c28f645c1b3da3
parent 9ef024ec8ae0318c89cc65dc0591aa40695393fc
author Jean-Baptiste Queru <jbq@google.com> 1363029789 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029789 -0700

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

* commit '9ef024ec8ae0318c89cc65dc0591aa40695393fc':