tree 2a70626925b2dbe00615377408ba1f41d06708e3
parent 7c926b4c9d4d5e50de76be6e68aa8ca3fd40770c
parent 7b4ea38b6cb9ee19deea3b1e7e2b669bd193f6f1
author Ye Wen <ywen@google.com> 1421296217 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421296217 +0000

am 7b4ea38b: (-s ours) am ecc4e8d5: (-s ours) Merge "DO NOT MERGE. Updating SDK prebuilt to 1681722." into lmp-mr1-ub-dev

* commit '7b4ea38b6cb9ee19deea3b1e7e2b669bd193f6f1':
  DO NOT MERGE. Updating SDK prebuilt to 1681722.