tree bcb6624239ac9a1044af355e569ac9a9d812e36b
parent 23d0f4830c50de1389ed58e7bc005ad9895b794c
parent b6e8bb5037f1e659762fb2be97bcfc1cccd78024
author Qiwen Zhao <zhao@google.com> 1414457017 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414457017 +0000

am b6e8bb50: (-s ours) am 0756ce33: DO NOT MERGE - Update prebuilt SDK to LRX13

* commit 'b6e8bb5037f1e659762fb2be97bcfc1cccd78024':