tree e560ac20bf8981dff19ced7c3c56db9588b9b8c5
parent f54803bbcc5b5319e598ed301616a57294fcb9b9
parent d587b00830b19f024968c497849768c602334a21
author Daniel Nishi <dhnishi@google.com> 1498497159 +0000
committer android-build-merger <android-build-merger@google.com> 1498497159 +0000

Merge "Upstream getApplicationLabel()." into oc-dr1-dev am: 7049137d7f
am: d587b00830

Change-Id: I75625816eba3a60c46bf27c6f7c6df7606e9faee