summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | am 0873b051: Grant licenseEvan Chu2012-09-201-0/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0873b0517eb1ab968be90f66f0b3cdbbeb62f78c': Grant license
| | * | | | | | | | | | | | | | | | | Grant licenseEvan Chu2012-09-201-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7125646 Change-Id: If700eb3cdd85e9ee08701d2dd8971ce2500a834d
| * | | | | | | | | | | | | | | | | | am b95ef0b6: copyright by The Android Open Source ProjectEvan Chu2012-09-2031-263/+425
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | * commit 'b95ef0b6e86a4fcfe2474ccaea0925f69a462bec': copyright by The Android Open Source Project
| | * | | | | | | | | | | | | | | | copyright by The Android Open Source ProjectEvan Chu2012-09-1931-263/+425
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7125646 Change-Id: I4de457f982857be315d65386f431d5eafcd8af02
| * | | | | | | | | | | | | | | | | Merge "Merge NFCEE wakelocks." into jb-mr1-devMartijn Coenen2012-09-181-19/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Merge NFCEE wakelocks.Martijn Coenen2012-09-181-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were just in for debugging. Bug: 6963484 Change-Id: Iac4b9185a615243783614429869f3f34b5cba82f
| * | | | | | | | | | | | | | | | | | am 7be608bc: Fix locking in PeerToPeer.Martijn Coenen2012-09-184-255/+462
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | * commit '7be608bcc4495aafcb700aa61072050fdc96f3e8': Fix locking in PeerToPeer.
| | * | | | | | | | | | | | | | | | Fix locking in PeerToPeer.Martijn Coenen2012-09-184-255/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PeerToPeer class had some serious multi-threading issues: - mServers / mClients simultaneously being accessed by different threads - P2pServer / P2pClient objects being deleted while still being used by other threads - Race conditions where we could go to sleep on a condition variable without ever waking up. This fixes most of the issues by: - Properly locking all access to mServers / mClients - Using Android's sp mechanism to do ref counting on P2pServer/P2pClient/NfaConn TODO: - Fix races around the condition variables - those are very hard to hit, but we need them fixed anyway. Bug: 7089048 Change-Id: I08564c65cc40734086e517d6107e31f86c3b6adc
| * | | | | | | | | | | | | | | | | am c6cf8e45: Integrate NFC Hardware Abstraction Layer.Evan Chu2012-09-185-76/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | * commit 'c6cf8e45c27d8a43d09b997cc223e8068d140edd': Integrate NFC Hardware Abstraction Layer.
| | * | | | | | | | | | | | | | | Integrate NFC Hardware Abstraction Layer.Evan Chu2012-09-185-76/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7123942 Change-Id: I4fa153b80e1af2b00b326370e102f714cde4334b
| * | | | | | | | | | | | | | | | am bd233c44: Merge "User proper error code during tag reading" into ↵Martijn Coenen2012-09-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-broadcom-nfc * commit 'bd233c444ac568b408880e5d5578500ef4c0578c': User proper error code during tag reading
| | * | | | | | | | | | | | | | | Merge "User proper error code during tag reading" into jb-broadcom-nfcMartijn Coenen2012-09-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | User proper error code during tag readingEvan Chu2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading a tag and it does not respond to a command, use taglost=1. It causes a TagLostException in the app. Bug: 7047415 Change-Id: I766849991441b82e5ad03d3031bc735fa5f9c27a
| * | | | | | | | | | | | | | | | | am a960b02c: Merge "Use correct app name for NFA_HciDeregister()" into ↵Martijn Coenen2012-09-112-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-broadcom-nfc * commit 'a960b02cc3f830d7e8dfc2a5b929aec5a23c7bab': Use correct app name for NFA_HciDeregister()
| | * | | | | | | | | | | | | | | | Merge "Use correct app name for NFA_HciDeregister()" into jb-broadcom-nfcMartijn Coenen2012-09-112-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Use correct app name for NFA_HciDeregister()Evan Chu2012-09-112-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "app name" parameters must match in HciDregister() and HciRegister() Change-Id: I43010268bb4c0ee7cdc7c1440346a6dedc230a58
| * | | | | | | | | | | | | | | | | am cf72e2c3: Fix NFC low-power modes.Evan Chu2012-09-111-11/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf72e2c30b6f0006068a3fa2ba02dba4917e7fb6': Fix NFC low-power modes.
| | * | | | | | | | | | | | | | | | Fix NFC low-power modes.Evan Chu2012-09-071-11/+24
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the end of nfcManager_doInitialize(), enter low-power mode. This logic is used after boot and before the user unlocks the screen. If the user does not unlock the screen, the phone stays in low-power mode. Additionally, only power off the chip if discovery is disabled AND the SE is not selected. Change-Id: I2bd2effce34b5dc586ad484c1da2ae86da49f0c1
| * | | | | | | | | | | | | | | | Add FLAG_ACTIVITY_NEW_TASK to viewIntentDoris Liu2012-09-071-3/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous CL that set FLAG_ACTIVITY_NEW_TASK flag in pendingIntent did not fix the bug. The flag needs to be set in the view intent. Bug: 6925612 Change-Id: Ibe5892c575fdf904c800c726122c59be6af02685
| * | | | | | | | | | | | | | | am 2bc17929: Use NFA_DM_DISC_DURATION_POLL from config file.Paul Chaisson2012-09-071-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2bc17929536528973571087813cb9746ea4947a6': Use NFA_DM_DISC_DURATION_POLL from config file.
| | * | | | | | | | | | | | | | Use NFA_DM_DISC_DURATION_POLL from config file.Paul Chaisson2012-09-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the poll duration ("NFA_DM_DISC_DURATION_POLL") from the conf file if one is configured. Change-Id: If17d402cbe8505b096a168640f99b88f7e3b6e48
| * | | | | | | | | | | | | | | am cdf5b0e0: Remove old NPP->SNEP redirect code.Martijn Coenen2012-09-072-451/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdf5b0e0c3cdd1b60a212fd4df510fb1e50bcbe5': Remove old NPP->SNEP redirect code.
| | * | | | | | | | | | | | | | Remove old NPP->SNEP redirect code.Martijn Coenen2012-09-062-451/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was used when Android did not support SNEP natively yet. The current Android behavior is to automatically try SNEP first, then fall back to NPP. Change-Id: Ifb1df3a5439cc1a7b939b4ae1dc70135d9c63a25
| * | | | | | | | | | | | | | | Merge "Do not dispatch empty NDEF tags as NDEF_DISCOVERED." into jb-mr1-devMartijn Coenen2012-09-061-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Do not dispatch empty NDEF tags as NDEF_DISCOVERED.Martijn Coenen2012-09-061-1/+4
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid encouraging sloppy filtering. This was actually already the behavior pre-JB. Change-Id: I556f250db086b70345123a151378728080b4779c
| * | | | | | | | | | | | | | | am 3463d49a: Correct spelling.Evan Chu2012-09-062-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3463d49a81556279bb0c4c74d9f4c9fd49ee61af': Correct spelling.
| | * | | | | | | | | | | | | | Correct spelling.Evan Chu2012-09-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie747c06a0a5161ad5479f93cbc56e482ed7da33c
| * | | | | | | | | | | | | | | am 7e5bdc93: correctly handle P2P congestion eventEvan Chu2012-09-061-10/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e5bdc93fb55d2090c4b32bff811abf4c39b2e52': correctly handle P2P congestion event
| | * | | | | | | | | | | | | | correctly handle P2P congestion eventEvan Chu2012-09-061-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly handle NFA_P2P_CONGEST_EVT to prevent race condition. Change-Id: If255ade96867d45b2a7cff1cb3d6e4cbc2d883d3
| * | | | | | | | | | | | | | | am 08030f1c: handle NACK, ACK for Mifare UltralightEvan Chu2012-09-063-1/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '08030f1c2a13eca1acc67b9d0763a3b6a2706f02': handle NACK, ACK for Mifare Ultralight
| | * | | | | | | | | | | | | | handle NACK, ACK for Mifare UltralightEvan Chu2012-09-063-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BLTH01652900: During trasceive operation for Mifare Ultralight, handle NACK and ACK responses properly Bug: 7047415 Change-Id: I778a2bbbcd3fff47b0da73ec37d76bf81708d931
| * | | | | | | | | | | | | | | am cf83b532: Merge "Remove "brcm" in names" into jb-broadcom-nfcMartijn Coenen2012-09-068-63/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | * commit 'cf83b532b9f3fec2a9b95ccc7bccf91526cf0b31': Remove "brcm" in names
| | * | | | | | | | | | | | | Merge "Remove "brcm" in names" into jb-broadcom-nfcMartijn Coenen2012-09-068-63/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Remove "brcm" in namesEvan Chu2012-09-068-63/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BLTH01642677. Remove "brcm" in names. Change-Id: Ic3a08abfeb2808d2a0b01402a76d9864b099ef49
| * | | | | | | | | | | | | | | am db216e63: Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.Martijn Coenen2012-09-061-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | * commit 'db216e63dad45973ff4992098229208a518d658f': Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.
| | * | | | | | | | | | | | | Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.Martijn Coenen2012-09-041-1/+2
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6925612 Change-Id: I37f49a150c4fc1763b2121e46fedf79d662b0a2b
| * | | | | | | | | | | | | am f340f1a0: Upgrade to stack NFA_MI_1.03.36Evan Chu2012-09-042-9/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | | * commit 'f340f1a071a54c6ea4644fcef45c784a9be3c19a': Upgrade to stack NFA_MI_1.03.36
| | * | | | | | | | | | | Upgrade to stack NFA_MI_1.03.36Evan Chu2012-08-312-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79510a45e8a552626f0473000e23d0fc6888ee33
| * | | | | | | | | | | | am 8e9cdd78: Create JavaClassConstants.h to store some global namesEvan Chu2012-08-2811-33/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e9cdd7891bc1d6589b6d51b7c39efc87a64ba5e': Create JavaClassConstants.h to store some global names
| | * | | | | | | | | | | Create JavaClassConstants.h to store some global namesEvan Chu2012-08-2811-33/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create JavaClassConstants.h to store some global names Change-Id: I918d9e8f6db646f637cddbebbc2c4e5c5495623d
| * | | | | | | | | | | | am dfc52b4b: In SyncEvent class, only unlock mutex onceEvan Chu2012-08-286-96/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | / / / / / / / / / / | | |/ / / / / / / / / / | |/| | | | | | | | | | * commit 'dfc52b4bafc435e72d25aaba736612352bfd0581': In SyncEvent class, only unlock mutex once
| | * | | | | | | | | | In SyncEvent class, only unlock mutex onceEvan Chu2012-08-286-96/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SyncEvent class, only unlock mutex once. Change-Id: I0fb797c9e6e8ea793fd38abd72a0c2780a734e95
| * | | | | | | | | | | am d1235cf7: Don\'t report empty NDEF tags as formattable.Martijn Coenen2012-08-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | * commit 'd1235cf7c2d0839264ccf90e9be7e19b66b58b6a': Don't report empty NDEF tags as formattable.
| | * | | | | | | | | Don't report empty NDEF tags as formattable.Martijn Coenen2012-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was regression from a JB change. Change-Id: Idbd92abf797478ec827dc26d6e825e2a6805356d
| * | | | | | | | | | am 59ff0d6e: During nfcManager_disableDiscovery() go to power-off-sleep mode.Evan Chu2012-08-231-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | | * commit '59ff0d6e6f4de4703a4489144a4311405eeead5a': During nfcManager_disableDiscovery() go to power-off-sleep mode.
| | * | | | | | | | During nfcManager_disableDiscovery() go to power-off-sleep mode.Evan Chu2012-08-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BLTH01634648: During nfcManager_disableDiscovery() go to power-off-sleep mode when secure element is not selected. Change-Id: I85c37fa635a90fdc8c90b5a86fe1d3e091d421d4
| * | | | | | | | | Use new display manager API.Jeff Brown2012-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d40a33bf11379845464f4072471c168f9dccf75
| * | | | | | | | | am e8e49093: Log NFC controller firmware version.Martijn Coenen2012-08-161-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8e49093826aa8309f4e16e5cd02174829e0310a': Log NFC controller firmware version.
| | * | | | | | | | Log NFC controller firmware version.Martijn Coenen2012-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALOGD is now squelched by default. Moved it to ALOGE. Change-Id: I3bb7601e65d01d8d01a95902a0be95c7e1a3426f
| * | | | | | | | | am 72a693f6: Remove unused functions; correct spellingEvan Chu2012-08-161-79/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72a693f626c4c766f8f8d835c28643252301fef5': Remove unused functions; correct spelling