diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2013-02-26 22:48:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-26 22:48:37 +0000 |
commit | 4c0f47b43acb6da89b18aab39a696244076cd615 (patch) | |
tree | ff425785e5100f99a1dda360746dd79012d85f56 /target/product/sdk.mk | |
parent | b11c7f8dec832734514fdae795a200bb22ab9df3 (diff) | |
parent | e45c235068ab3024814f1f724ca01d1178b4cf1b (diff) | |
download | build-4c0f47b43acb6da89b18aab39a696244076cd615.zip build-4c0f47b43acb6da89b18aab39a696244076cd615.tar.gz build-4c0f47b43acb6da89b18aab39a696244076cd615.tar.bz2 |
am e45c2350: (-s ours) am bf13b892: am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
* commit 'e45c235068ab3024814f1f724ca01d1178b4cf1b':
Diffstat (limited to 'target/product/sdk.mk')
0 files changed, 0 insertions, 0 deletions