tree eafa376697b76100636cccae4135cefcd081bd63
parent f7c97ce40057ce9344a0e887c13aba4fdd45c1d4
parent d099cd97a229a1dd66d8b069815fd9bfc39d0762
author Jean-Baptiste Queru <jbq@google.com> 1363030880 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030880 -0700

am d099cd97: am 80db0db5: am 8b40761a: (-s ours) am 35cf1243: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd099cd97a229a1dd66d8b069815fd9bfc39d0762':