tree 558a8b3ae9ec1b9dc55f6da6d283ae3a15d4377b
parent 65c21107c6fc86271e1a2c0798fd54ec8df52e67
parent c7d7332eb4859a77ea749744648ac7a8810a09e2
author Daniel Kim <daniel.kim@panasonic.aero> 1391637728 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391637728 -0800

am c7d7332e: am 93006d12: cherry pick from aosp. https://android-review.googlesource.com/63805

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