tree 05d4a9aa221e3ee0e5ec3f175cd30df164340b41
parent d2be52a37d999f94598a1e4d3341070027e71dc8
parent fee7c3af1dfba91e77f126aef7bff7d174927644
author Qiwen Zhao <zhao@google.com> 1423678128 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423678128 +0000

am fee7c3af: (-s ours) DO NOT MERGE ANYWHERE. Update prebuilt SDK to LMY42

* commit 'fee7c3af1dfba91e77f126aef7bff7d174927644':
  DO NOT MERGE ANYWHERE. Update prebuilt SDK to LMY42