Narayan Kamath a00ed7f725 am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp ...

* commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626':
  Move certain internal activity manager methods to new class.

2014-04-09 14:03:47 +00:00

..

android

am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

2014-04-09 14:03:47 +00:00

com

am 5784b398: Merge "Launcher APIs and broadcasts for managed profiles"

2014-04-09 00:45:12 +00:00

jarjar-rules.txt

…

overview.html

…