tree 9452dfd9f318ae7345498d99b150a78290f490e5
parent 32753b9e57cc74baf456ddfdd647321b5a6a6054
parent 072ab9d882298378210c0c734b07774a50e0bebd
author qling <qling@sta.samsung.com> 1391657414 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391657414 +0000

am 072ab9d8: am 1b7ee55c: am 8a00867b: am 2657d26e: am a377c173: am c4cd2217: am f8e2a101: am e5698ead: am e5aa1551: am 607653e9: am 643f0f19: am 2ff6a3b0: Cherrypick to jb-dev https://android-review.googlesource.com/61031

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