tree 441b454713ae4315768545a2740c85f49edfc986
parent e1d851d36d0260f3e02e5ae7f372f8ab42494f8b
parent f021d12f6f7116e9275cd3553a349ce5cb8aab14
author The Android Open Source Project <initial-contribution@android.com> 1271866515 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271866515 -0700

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