commit | 06296c3e44c3b51eedd02f73b3c7399f6af39a78 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 31 19:45:31 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 31 19:45:31 2011 +0000 |
tree | b2dcbaba8c6a039de0ff8f60bafcd2776a303f3b | |
parent | f5c40bdbcabbe81fdf43a24cd82be919ffb5de04 [diff] | |
parent | ea4994501a05defd99ef3599c811959cfe30ef6c [diff] |
am ea499450: Reconcile with ics-factoryrom-2-release * commit 'ea4994501a05defd99ef3599c811959cfe30ef6c': Revert "Add event logs for NFC events. DO NOT MERGE" Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"