tree 37b5cead2f2408a1c6b0c5f60c2094deec58257e
parent 753fd85443a93a179a494f3359e40eb38baf102e
parent 870d5f16a59eca02b888c223fd86f0570a9253b6
author Dianne Hackborn <hackbod@google.com> 1363116790 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363116790 +0000

am 870d5f16: Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev

* commit '870d5f16a59eca02b888c223fd86f0570a9253b6':
  Add LOCAL_APK_LIBRARIES argument.