| commit | d9dac62b0764c580f4ec12c1db04671f347aab7e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:30:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:30:48 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | a3dec0763d10f9838cc715ecc5a081a024d7abb4 [diff] | |
| parent | 65141106af8089dbccc1ad1243e1ed8e3bee9531 [diff] |
am 0f514649: am 145afc2c: (-s ours) am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." * commit '0f5146490b1c9d07297753dff26780e812db3f20':