tree 86d25aa684aa712602a2875c5606d9a47679e3c7
parent 0fd55ba58eee50c65bc52ce44f7374e91ac83b54
parent d33e3775c8785bf6b93787058b9c779b67860368
author Andrew Hsieh <andrewhsieh@google.com> 1350021000 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350021000 -0700

am d33e3775: resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp

* commit 'd33e3775c8785bf6b93787058b9c779b67860368':
  resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp