tree fc79850770acd5f1fe0d6bb30cd272e3d1cef3fa
parent b21bb2dacea1e5b80d7ee4da306e6482c0160bcd
parent 31173957b2c2b23fca16056411d0cc4c3bb3029a
author Jean-Baptiste Queru <jbq@google.com> 1363029778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029778 -0700

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

* commit '31173957b2c2b23fca16056411d0cc4c3bb3029a':