tree d04e8c70cababa81ab1c834101cbc9a353a126c2
parent 50e384c01b5b1c2adbf072bdaac928e3e5c023aa
parent 00d1d614f6e9c29e366b2608cd37814856df5efc
author Ying Wang <wangying@google.com> 1319688479 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319688479 +0000

am 00d1d614: am b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0

* commit '00d1d614f6e9c29e366b2608cd37814856df5efc':
  new LOCAL_DEX_PREOPT option "nostripping"