diff options
| author | Romain Guy <romainguy@android.com> | 2010-02-18 11:02:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-18 11:02:32 -0800 |
| commit | f59a3c14c1d2ad701a842c1b66fa14e2d022c313 (patch) | |
| tree | bbc8c1418ad13bc3fade1747213d7fda24113367 | |
| parent | 24f8a8507852fce16334ac34cf1fd7b03752382b (diff) | |
| parent | ab4835ee0df866a4f7982644742e2b758c50fdd7 (diff) | |
| download | frameworks_base-f59a3c14c1d2ad701a842c1b66fa14e2d022c313.zip frameworks_base-f59a3c14c1d2ad701a842c1b66fa14e2d022c313.tar.gz frameworks_base-f59a3c14c1d2ad701a842c1b66fa14e2d022c313.tar.bz2 | |
am ab4835ee: (-s ours) am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Merge commit 'ab4835ee0df866a4f7982644742e2b758c50fdd7'
* commit 'ab4835ee0df866a4f7982644742e2b758c50fdd7':
Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
0 files changed, 0 insertions, 0 deletions