tree 6d58cb7f0afe537f44a784619dfa6eacce50d533
parent 04c7d3d257abb7ef2a0298700677858c9d0938c3
parent be45b22a515053acbc782c337498f495b23e13cc
author Dan Willemsen <dwillemsen@google.com> 1459804441 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1459804441 +0000

Merge "Update Android.bp with recent Android.mk changes"