commit | 36133a506c09c088d8c52141c35b2019a6b3735b | [log] [tgz] |
---|---|---|
author | Griff Hazen <griff@google.com> | Tue May 20 21:17:19 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 21:17:19 2014 +0000 |
tree | e9219a50e74f67d89d20123e45fff8a66e4d71d8 | |
parent | 45a155f54bc6b3bfe89586539ad180bdb5690e98 [diff] | |
parent | 89a546693f43ab1e93f3b640b94e5f21d05f4058 [diff] |
am 89a54669: (-s ours) am 89391bd3: DO NOT MERGE Update SDK prebuilt from 1183558 * commit '89a546693f43ab1e93f3b640b94e5f21d05f4058': DO NOT MERGE Update SDK prebuilt from 1183558