| commit | d18dc0057988df70b375a453bfc7a188e2ed2891 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Thu Aug 11 21:52:20 2011 -0700 |
| committer | JP Abgrall <jpa@google.com> | Thu Aug 11 21:53:02 2011 -0700 |
| tree | 9ffe0d2ae59e40c72b5efa599b406a4b8d6534c1 | |
| parent | 189de0c1f4339abd7b938b4905775163d2a94bbe [diff] | |
| parent | a88c13bfa9fa57780b8193e873b48f8fc0143f70 [diff] |
resolved conflicts for merge of a88c13bf to honeycomb-plus-aosp The Android.mk's LOCAL_SRC_FILES was different from gingerbread. Change-Id: Ie1777a5f449e6b135320e92d0dc1c593869aa266 Signed-off-by: JP Abgrall <jpa@google.com>