| commit | ee34239f57fd3e6357ab5ed6021cd0a146f5650b | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Dec 01 16:20:23 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 01 16:20:23 2011 -0800 |
| tree | b956ac896b0bf5f2aeb4eed3c04dcca1ef87a55c | |
| parent | f1e2c7f699995f5554764e82495b73ccbdf83a61 [diff] | |
| parent | 14d5943a2f1197634c918fdfb565e62555848aaf [diff] |
am 14d5943a: am 6c8a38a7: Merge "Issue #5689186: Add Guava as a dependency for NFCDemo sample" into ics-mr0 * commit '14d5943a2f1197634c918fdfb565e62555848aaf': Issue #5689186: Add Guava as a dependency for NFCDemo sample