commit | 15d304cda5ee102233c1026f56ccfbb5ba87fc2e | [log] [tgz] |
---|---|---|
author | Griff Hazen <griff@google.com> | Wed May 21 11:16:59 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 11:16:59 2014 +0000 |
tree | ad53e818033341e00ce55d958383ebd1af0a3620 | |
parent | 421b2312ddc96c5176c5c58417fbe557b89d6ff3 [diff] | |
parent | b8ad0852d5966a655c208da2e1d9b3f21b276569 [diff] |
am b8ad0852: (-s ours) am 01e97264: DO NOT MERGE Update SDK prebuilt from 1184974 * commit 'b8ad0852d5966a655c208da2e1d9b3f21b276569': DO NOT MERGE Update SDK prebuilt from 1184974