tree 1e16fcbb56da6cf69c3d44738cfcc0c949312bc6
parent a18ff6f1ae45c4553e7d2e0c65a5b347bbb370e4
parent d4ed4363101201ed24795f50064fe76cb754f979
author Jean-Baptiste Queru <jbq@google.com> 1361918010 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361918010 -0800

am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge

* commit 'd4ed4363101201ed24795f50064fe76cb754f979':