tree 6adc32b3731bb36f564f9d71ffd1c73f5bc6a763
parent cc1eef493524af0ce727927996b346312637c78a
author Raphael <raphael@google.com> 1320295842 -0700
committer Xavier Ducrohet <xav@android.com> 1320360159 -0700

cherrypick 76bd108d from master. do not merge.

Change-Id: Ibb677f286b54a9dd593301a0f8b194d3b2dc58d1
SDK: update SDK to API 15