| commit | 65141106af8089dbccc1ad1243e1ed8e3bee9531 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:49:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:49:28 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 04e1f221b7ce6c64418c46d686d801e96cd539e1 [diff] | |
| parent | f27bd491167418fb3efbab5ee7beae9080bf8fd0 [diff] |
am 145afc2c: (-s ours) am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." * commit '145afc2cc4f973a4ad63aeabe5b0f633c8e99cec':