tree adafbe6ca9d526febd13c44178317188cbeec1ab
parent 43c5427c791b541a7ee5671cb5bd421c64c2f5e9
parent 4e0b2a5ee74c2474e079754b41dbcddcde80bf8f
author Android Build Merger (Role) <android-build-merger@google.com> 1467325260 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467325261 +0000

Merge "Fix support lib build DO NOT MERGE ANYWHERE am: 287c5a0be2  -s ours am: c54d14d35c  -s ours" into nyc-mr1-dev-plus-aosp