| commit | d36e8df7241f2433233377bbc803468c91ae8ad9 | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Thu Apr 17 19:36:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 17 19:36:04 2014 +0000 |
| tree | 03e2a1cf34a31ee55b4228cae02e9d9dd52f056a | |
| parent | 1b866eeb58867fd9bb2496dacdd3283c18893792 [diff] | |
| parent | 84f4adc9a5e3cc818ed972dc7fecbafb131a779a [diff] |
am 84f4adc9: Merge commit \'59dfbb91\' into klp-modular-dev-plus-aosp * commit '84f4adc9a5e3cc818ed972dc7fecbafb131a779a': Fix build [DO NOT MERGE]