tree a08d9b33758dd89fd247d1bf3a16c23ec660dd1d
parent 056d9ee45a8854441626e27a8ec3ad1339fb0728
parent 01579953331b415c2ad1f04f91815d1f6eabe1e2
author Dianne Hackborn <hackbod@google.com> 1394143763 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394143763 +0000

am 01579953: am 76e1d769: am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev

* commit '01579953331b415c2ad1f04f91815d1f6eabe1e2':
  Fix issue #11536426 DO NOT MERGE