diff options
| author | Jesse Hall <jessehall@google.com> | 2013-10-30 23:21:21 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2013-10-30 23:21:24 -0700 |
| commit | 18f94b1e6c489f0d68c694a197aae898c68124bb (patch) | |
| tree | 07c56b1b84cb2779647efff3821fc3ac672227aa | |
| parent | bb3b52495909ee1ce5d8b9beb6e8a9c72f0cdd90 (diff) | |
| parent | 51b27e823373f1cfc709f20d0d704a7d4e558894 (diff) | |
| download | native-18f94b1e6c489f0d68c694a197aae898c68124bb.tar.gz | |
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
0 files changed, 0 insertions, 0 deletions