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