tree 63f5fd378c80fc9f7c33353cc9b128617229bae8
parent 7819abd2d191a170cbc9d4bd190001c465187a9d
parent 63cc80ff010b8bdac107da9cdd1e32b72ca602f7
author Jean-Baptiste Queru <jbq@google.com> 1363030917 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030917 -0700

am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63cc80ff010b8bdac107da9cdd1e32b72ca602f7':