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