tree ecae3b1abaa57c09220319de58927782557558f3
parent 812eb3c5cba3d5aca3c755c51e3a81e91f6b94c4
parent 03b1a0028d608305cce6c832fc3a4b98b45eaec5
author Jean-Baptiste Queru <jbq@google.com> 1363031231 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363031231 -0700

am 03b1a002: (-s ours) am 32c3e965: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '03b1a0028d608305cce6c832fc3a4b98b45eaec5':