tree 38e7a79da20cf168bc915745e26ce95f226627e3
parent a918fec5a1dc028e9b04a71d0e37ee1bab6caa61
parent 92be9d34bf220d26f49ed1b328a84d3cad84d21f
author Jean-Baptiste Queru <jbq@google.com> 1363029787 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029787 -0700

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

* commit '92be9d34bf220d26f49ed1b328a84d3cad84d21f':