tree fe832481520daa32247a77b5c5169101004ee32f
parent db9ff2c0d1654ae985d19365bb78aad0eab94928
author Fredrik Roubert <roubert@google.com> 1448471269 +0100
committer Fredrik Roubert <roubert@google.com> 1449517009 +0100

Android.mk file updated for ticket #11986 cherry-picks.

Change-Id: I75313ac229fd65af39d9494aa30a745fd84bb40f