tree 257e3dcf4801f649618a44c453253c016d953903
parent 8d674a4b6f4300df90415889c2f57fe8b383e867
parent 0b904fdaa636372e9173f1fb4a5dae5c382aabb8
author Jean-Baptiste Queru <jbq@google.com> 1363032815 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032815 -0700

am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0b904fdaa636372e9173f1fb4a5dae5c382aabb8':