| commit | 76e1d76948c68f9414a9ca0271ea9dfb6da40191 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Mar 06 20:06:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 20:06:05 2014 +0000 |
| tree | 3bc4f2f1affdd2aaa2a3deff82398df57506a8b6 | |
| parent | 5999904094865f27febb7588f1a40b5561ef8d4b [diff] | |
| parent | 12caef7836a21fa20d052e4868df92e23b930cf6 [diff] |
am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev * commit '12caef7836a21fa20d052e4868df92e23b930cf6': Fix issue #11536426 DO NOT MERGE