tree d1b3f2deb7d1500a479793b8233a3173ff0f0cf8
parent 0dac2c52dd050a25928ad561d027b0d165c84ce0
parent 3ba28b0083628e6a22fce17ae015b90a4133bea6
author Dan Willemsen <dwillemsen@google.com> 1482266529 +0000
committer android-build-merger <android-build-merger@google.com> 1482266529 +0000

Merge "Add system/extras/Android.bp" am: 3a1544a877
am: 3ba28b0083

Change-Id: I8a178dd5c5d119a94f9655ab89d80f0f58e68aeb