| commit | ebf724b6414bc92e5e034b31ef1a81d9beb05cd7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jan 17 11:34:23 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 17 11:34:23 2013 -0800 |
| tree | 93547179c8847f8d16fe051b2deae8f462327903 | |
| parent | 0f8d155363c361199a9d9aa5dcdbc4088990f893 [diff] | |
| parent | 2d40f625c457d93cd7fabb0ca8ea360519f40da9 [diff] |
am 2d40f625: (-s ours) Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp * commit '2d40f625c457d93cd7fabb0ca8ea360519f40da9': DO NOT MERGE Fix build.