tree 01610dec479020fa54355b283d31f8c58b1c59f3
parent 43f272afd56a57640c62c952f9266478bacf0244
parent 8a0cbe1bcb3e605f194c79c014c4ee5ef6047528
author Andrew Hsieh <andrewhsieh@google.com> 1350450476 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350450476 -0700

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

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