tree b956ac896b0bf5f2aeb4eed3c04dcca1ef87a55c
parent c08eaec1e2d4f5bd9edc0fd764184b8095a4fce3
parent 6c8a38a780cbc0411ee6510f4c2b54c86e097edd
author Trevor Johns <trevorjohns@google.com> 1322785154 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322785154 -0800

am 6c8a38a7: Merge "Issue #5689186: Add Guava as a dependency for NFCDemo sample" into ics-mr0

* commit '6c8a38a780cbc0411ee6510f4c2b54c86e097edd':
  Issue #5689186: Add Guava as a dependency for NFCDemo sample