tree ff2106afa15f80bc00fd3453637a92d89e4b6fa0
parent ea8a2e8e475b2225c97fbef23cc6d2ddf2201593
parent 9f242318c25e154c1e94823715dd93775b54e555
author Senpo Hu <senpo@google.com> 1436831653 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436831653 +0000

am 9f242318: (-s ours) DO NOT MERGE ANYWHERE. Update prebuilts/sdk to MNC-DEV #2080332

* commit '9f242318c25e154c1e94823715dd93775b54e555':
  DO NOT MERGE ANYWHERE. Update prebuilts/sdk to MNC-DEV #2080332