diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-05-08 19:12:48 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@google.com> | 2014-05-08 19:12:48 -0700 |
| commit | 6ca0579cc42285bcd2394541c132d33b7e6636c4 (patch) | |
| tree | 4300366aa90070acf678182f063f1021b1d8cf5f | |
| parent | 4c1516403c739c26a1cf99e76f5f11e9339ae3cd (diff) | |
| parent | 5d7058e521c0b67a07086e51032f018838044f1f (diff) | |
| download | sdk-6ca0579cc42285bcd2394541c132d33b7e6636c4.zip sdk-6ca0579cc42285bcd2394541c132d33b7e6636c4.tar.gz sdk-6ca0579cc42285bcd2394541c132d33b7e6636c4.tar.bz2 | |
resolve merge conflicts of 5d7058e to master.
Change-Id: If2bd442bf53c312e23a822081745f089254e8538
| -rw-r--r-- | build/product_sdk.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/product_sdk.mk b/build/product_sdk.mk index f5f8146..f1acd5f 100644 --- a/build/product_sdk.mk +++ b/build/product_sdk.mk @@ -27,3 +27,4 @@ # Host tools and java libraries that are parts of the SDK. PRODUCT_PACKAGES += \ + |