| commit | 045ed665197ed3ba0681db173a058a55662cd16a | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Mar 07 18:18:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 18:18:31 2014 +0000 |
| tree | 83d3dbed615bc601ce5bf18eb9c1fcdcb4555438 | |
| parent | 66069adb9d22f28b48bd4689b592c887c008be52 [diff] | |
| parent | 8e904d565e8a54f755814e9ae062743b8b012731 [diff] |
am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev * commit '8e904d565e8a54f755814e9ae062743b8b012731': More on issue #12031685 (DO NOT MERGE)