tree f16937f99a210f355bb5efc0fe0b82fd64d3722f
parent 1450c47ba8cf327d9681eb34fda0754feb208ff9
parent 12b61826cdee963d0d01f29bf03c11f735f08a41
author Jean-Baptiste Queru <jbq@google.com> 1361917897 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361917897 -0800

am 12b61826: am 61ea9d98: Reconcile with jb-mr1-release - do not merge

* commit '12b61826cdee963d0d01f29bf03c11f735f08a41':