diff options
| author | Dirk Sigurdson <dirk.sigurdson@t-mobile.com> | 2010-02-07 01:49:14 -0800 |
|---|---|---|
| committer | Dirk Sigurdson <dirk.sigurdson@t-mobile.com> | 2010-02-07 01:49:14 -0800 |
| commit | b95e715706d92e7c3225737115919c115c957de4 (patch) | |
| tree | 60cb3c974e136d4a261510d8b36aa1c231a1d6bf /NOTICE | |
| parent | 5d29366790e8fe6239d66e1e662ab05068b0549b (diff) | |
| parent | 6ff3f8add87358b8489fa3f1705cf3bbfa34bc38 (diff) | |
| download | frameworks_base-b95e715706d92e7c3225737115919c115c957de4.zip frameworks_base-b95e715706d92e7c3225737115919c115c957de4.tar.gz frameworks_base-b95e715706d92e7c3225737115919c115c957de4.tar.bz2 | |
Merge remote branch 'korg/eclair' into themes-eclair
Conflicts:
core/java/android/app/ActivityThread.java
core/java/android/content/pm/ActivityInfo.java
core/java/android/content/res/AssetManager.java
Diffstat (limited to 'NOTICE')
0 files changed, 0 insertions, 0 deletions