Craig Mautner a6066bb7a4 am 35fc6a02: Merge "Implement setActivityLabelAndIcon()." ...

* commit '35fc6a02aeded9578375af5828e14043164028d5':
  Implement setActivityLabelAndIcon().

2014-04-03 20:43:44 +00:00

..

java/com/android/server

am 35fc6a02: Merge "Implement setActivityLabelAndIcon()."

2014-04-03 20:43:44 +00:00

jni

am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev

2014-04-03 02:11:40 +00:00

Android.mk

…