tree 0d4b215a5c6da537535b6e9fd66eb14d0932c76b
parent 1a3ee2b8928fe69d13bdfb980ac1c7994ff0d334
parent d5a63fb6d763551b31f0dd9563ccc17e4652094b
author Jean-Baptiste Queru <jbq@google.com> 1363034658 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034658 -0700

am d5a63fb6: am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd5a63fb6d763551b31f0dd9563ccc17e4652094b':