tree 79469405cfecaffc2c4149624f104c8346c6cba8
parent bbaa5b836aa511f7de5064275fb82f9c64316382
parent ecc7fe213ce34f511e0f421c23f0e032515e4e15
author TreeHugger Robot <treehugger-gerrit@google.com> 1513350914 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1513350914 +0000

Merge changes from topic "am-c94c607f-8b6c-42d6-b9c8-4d95ded6329f"

* changes:
  [automerger] Sync jetpack and master Android.mk files. am: 7412f7ff1d
  Sync jetpack and master Android.mk files.