tree d4850daa015c7792b1e48c08377804558ca0f4b1
parent e9dfd94b218f29d24bee8fed7721eb49d1705133
parent 607653e9876ffe2ee337945e587afc03a01b0fad
author qling <qling@sta.samsung.com> 1391655706 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391655706 -0800

am 607653e9: am 643f0f19: am 2ff6a3b0: Cherrypick to jb-dev https://android-review.googlesource.com/61031

* commit '607653e9876ffe2ee337945e587afc03a01b0fad':
  Cherrypick to jb-dev https://android-review.googlesource.com/61031