resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp

File was moved to system/core.git. Change will be applied there.

Change-Id: Ic2027b7f3f1f1fb4b896a219a8c1b4ab545d9723
This commit is contained in:
Jesse Hall 2013-10-30 23:21:21 -07:00
commit 18f94b1e6c

Diff Content Not Available