tree 55fdd3c2c37621107701107c680523bbccdf7a4c
parent 8a06bac1db18ff7702dbd2a4ffbdde97330cd665
parent b93e03cbc9d47a9d9a385c780ed64639e2a23ae5
author Ying Wang <wangying@google.com> 1275509492 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275509492 -0700

am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master

Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken

* commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
  Cherry-pick unbundled build changes from master