tree d52c4efe4f5fa3379014c0e961d44ade6d5e8b4c
parent 71a8a4373d209c4674ae8d4b4fe2003dc9fe9de1
parent 10b6c755a64e7f4204293f0fdd0de2c23925d107
author Daniel Kim <daniel.kim@panasonic.aero> 1391638997 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391638997 +0000

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 '10b6c755a64e7f4204293f0fdd0de2c23925d107':
  cherry pick from aosp. https://android-review.googlesource.com/63805