tree c8667229f4db3246eb4fa8f13bc537e24703a1bf
parent 82bdbbfc31b27ac14f98d8375dbaa5dd1c0b8613
parent 2d9e4e9f3f1d63212e0abf0a85bfa1e49c32cba7
author Jean-Baptiste Queru <jbq@google.com> 1363030059 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030059 -0700

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

* commit '2d9e4e9f3f1d63212e0abf0a85bfa1e49c32cba7':