tree 37b5cead2f2408a1c6b0c5f60c2094deec58257e
parent 51e11eea6d64dd156ce22ff3103ddf5676ef2d73
parent a1fece009f2e93250b2d3bc8ee4a296d100da6dc
author Dianne Hackborn <hackbod@google.com> 1363116671 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363116671 +0000

Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev