Merge "Do not attempt to configure null preferred activity" into klp-dev
authorDavid Braun <dabraun@google.com>
Wed, 13 Nov 2013 23:42:08 +0000 (23:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Nov 2013 23:42:08 +0000 (23:42 +0000)
commit98003f87d01a98d3fd2a0561d0cfa45912ba2325
tree473abb563e0c052c6f6a813a44e189c15073f12b
parent088822a20462b9f364c22c88dbba2091000e2f4b
parentd8fb3ddda34db44297cf4b0f970b01bf58598960
Merge "Do not attempt to configure null preferred activity" into klp-dev