tree 6b6c95adb2a8197dacceb395890c4e37e32b632d
parent 81b68ad95d6a8ecb8a44ad453d336dff3a059488
parent 1ae607add31de4708e732c7139e68d425b920595
author Ying Wang <wangying@google.com> 1277828280 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277828280 -0700

Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo