OSDN Git Service

resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp
authorJesse Hall <jessehall@google.com>
Thu, 31 Oct 2013 06:21:21 +0000 (23:21 -0700)
committerJesse Hall <jessehall@google.com>
Thu, 31 Oct 2013 06:21:24 +0000 (23:21 -0700)
commit18f94b1e6c489f0d68c694a197aae898c68124bb
tree07c56b1b84cb2779647efff3821fc3ac672227aa
parentbb3b52495909ee1ce5d8b9beb6e8a9c72f0cdd90
parent51b27e823373f1cfc709f20d0d704a7d4e558894
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