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