tree c5fb74c9e54b744451da9f329c94dfd4714eae5d
parent cda61e95f6b600378ab64f43beb42dbbfa2f6a1a
parent 785d764bd56b2d41216aa52ab8f6b6af9179f9c9
author Dianne Hackborn <hackbod@google.com> 1394216119 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394216119 +0000

am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev

* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)