tree 26c988da40785375f5c2fc6d49f129bc0e6a10b2
parent 368f409ad17191d9dd59bef6319fe8451b2bf652
parent 5e09d287bef84a652031ac215aa919320ad4e662
author David 'Digit' Turner <digit@google.com> 1440629659 +0000
committer android-build-merger <android-build-merger@google.com> 1440629659 +0000

am 3cc1518e: (-s ours) Update prebuilt emulator binaries. automerge: f287663 automerge: 58b07a5
automerge: 5e09d28

* commit '5e09d287bef84a652031ac215aa919320ad4e662':