tree 1a3fa37191b95f021329b41ac6d31ec6f01b0d75
parent 5a2906a8e88154a6647f1d30079039a2bd712a4d
parent 467eda5756e85388e41fbedc34f4d0f2f411d710
author Daniel Kim <daniel.kim@panasonic.aero> 1391638113 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391638113 -0800

am 467eda57: am 14ba13d4: am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805

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