commit | a327dcfd79161c7fe48372f35d02918fca04af50 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 21 09:15:15 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 21 09:15:15 2010 -0700 |
tree | 05304c8d792772cbb98c0bd2b3283e1a3bf96553 | |
parent | 9318b6088dd323d391f76889ad2733c751688d9a [diff] | |
parent | fc821e5d26c6273e667b15d52e3fb691e2e53f87 [diff] |
am f021d12f: merge from open-source master Merge commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14' into kraken * commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14': Allow META* macros outside of the framework Fix printing order of phone objects creation