| commit | 4cf6f6b5b639d2415ff48c1cb04ca6c8d71f5e33 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jun 16 10:29:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 16 10:29:52 2014 +0000 |
| tree | 2e61cad57d978fe445fedc3db1a732d0bbe91f09 | |
| parent | cf72e81434e362e266eda34d2836bb2c0cff2cec [diff] | |
| parent | 5ee062c07d3c83cf520209a3f859fbf09ded1fdc [diff] |
am 5ee062c0: am 92908994: Merge "Fix bogus define checks and a typo." * commit '5ee062c07d3c83cf520209a3f859fbf09ded1fdc': Fix bogus define checks and a typo.