tree b817abe2dbb5bb655d958c84e906104c8ea3dcde
parent e442cc8c1d172dac13421bbd354fc232d72a718a
parent 342031887f5be5514ec549d9fd4ef3281348b45f
author Qiwen Zhao <zhao@google.com> 1423682464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423682464 +0000

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

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