tree ba7c43f6a83d76f1d0c28f016526a14d070b8398
parent 631bcb7a533ce1f3da07299a9b8dc46598cd2ae3
author Xavier Ducrohet <xav@android.com> 1300483113 -0700
committer Xavier Ducrohet <xav@android.com> 1300483170 -0700

Revert "Revert "Merge 29e114d2 from master.""

This reverts commit 2facea6512c84af9285682909f6ac6edcd4130ab
which was not supposed to merge down from tools_R10 to master
since the original reverted commit was a cherry-pick from master
to tools_r10

Change-Id: Ide87af693a0f3239bacaa7313b9262e6e8c46800