| commit | b1cf5773e93826391bbea6bf2e753c35738a960a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jan 09 23:35:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 09 23:35:13 2015 +0000 |
| tree | 4ecfb347a7a8cceb1619601b894ed1c4638c6009 | |
| parent | b78d635fa9ffac346a567baf01104a83ca761a99 [diff] | |
| parent | 0b03b2ff7cf79a70606fe5b3256e67d99d5ebdd3 [diff] |
am 0b03b2ff: am 1de53249: Merge "Clean up some #ifdefs." * commit '0b03b2ff7cf79a70606fe5b3256e67d99d5ebdd3': Clean up some #ifdefs.