commit | 8e904d565e8a54f755814e9ae062743b8b012731 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri Mar 07 18:15:19 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 18:15:19 2014 +0000 |
tree | c5fb74c9e54b744451da9f329c94dfd4714eae5d | |
parent | cda61e95f6b600378ab64f43beb42dbbfa2f6a1a [diff] | |
parent | 785d764bd56b2d41216aa52ab8f6b6af9179f9c9 [diff] |
am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev * commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9': More on issue #12031685 (DO NOT MERGE)