tree 9c3aa79c8f9d81358a23f7eea34f4883b27e3d9c
parent 6e0bff0d1bc52b90a4219b26f93ed41329415098
parent 33adccd203ee8303cd0bf489e3f072d362e1705d
author Jean-Baptiste Queru <jbq@google.com> 1363032821 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032821 -0700

am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '33adccd203ee8303cd0bf489e3f072d362e1705d':