| commit | 9c5aa2807420b16ac6b238a3e5035381fa67b93c | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Dec 14 18:45:12 2011 -0800 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Dec 14 18:46:51 2011 -0800 |
| tree | 8290b13b2a54de2b3371114cf1688d1919463a54 | |
| parent | a9f8ec992bc9916b7fc17d15929884295bab148f [diff] | |
| parent | b1b3e4429fc0f35b18f60aef2685b918b151f847 [diff] |
Merge remote branch 'goog/honeycomb-mr2' into ics-mr0 Conflicts: apps/CtsVerifier/jni/verifier/com_android_cts_verifier_os_FileUtils.cpp Change-Id: I2d92aea5a045dca9e758f7cc2d2746ddb52bd726