| commit | 1f31d2d90205967edb3a7e662e5046685c946f98 | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Fri May 23 19:43:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 23 19:43:49 2014 +0000 |
| tree | 1bac8a9b3a793a4f7dc344880353fe3f8cc2f3f1 | |
| parent | 5cb1b894df614fb5bd4a90bd66661c74cb92c148 [diff] | |
| parent | 417c481fdca05f11ad956a301cca7fcf52ec5e2c [diff] |
am 417c481f: (-s ours) am f87169e2: DO NOT MERGE Update SDK prebuilt from 1189671 * commit '417c481fdca05f11ad956a301cca7fcf52ec5e2c': DO NOT MERGE Update SDK prebuilt from 1189671