tree e62fd10e72c4015153f34f13e7fc899b9ca95d98
parent 44ec74db191f88dc22143b55cacc262bc8fc3cd2
parent ff8ba6533e1ad27cc040851147d641d4daf18992
author Scott Main <smain@google.com> 1311793081 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1311793081 -0700

Merge "cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3 fix sdk build"