| commit | 53393240e8621aadcfd55bdbafd96c620efda479 | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Fri May 07 19:57:51 2010 +0900 |
| committer | satok <satok@google.com> | Fri May 07 19:57:51 2010 +0900 |
| tree | 1b54ab8792a8fd3add27ad7bf2b7872e1401ba47 | |
| parent | 5c7c33735df5313ecbf8e40efd72edeb0cf941b2 [diff] | |
| parent | f53d0da540d4aca9c0b78938094e13a828ab1bd6 [diff] |
Merge commit 'goog/master' Conflicts: native/Android.mk