tree d483eeab1a223221dd435ac91c618f3d1c06b454
parent 8ee327bf95da4bd7c890312d2f4ab79ef1e48105
parent 33fea6f5d658223aac48da074de67b7096a61dc8
author Daniel Kim <daniel.kim@panasonic.aero> 1391639555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391639555 +0000

am 33fea6f5: am 2f35ccfb: am 10b6c755: am 0979fd66: am f806c7a7: am 9a0d81ed: am 719b7c5e: am c7d7332e: am 93006d12: cherry pick from aosp. https://android-review.googlesource.com/63805

* commit '33fea6f5d658223aac48da074de67b7096a61dc8':
  cherry pick from aosp. https://android-review.googlesource.com/63805