tree f1a2379544804babfa7ccd9c007c5df9b142ea5a
parent 24515b76a98e7549d1010aa95aeefb2f2c296628
parent 58be3970446750535c72429193c669135816b3f5
author Elliott Hughes <enh@google.com> 1499380921 +0000
committer android-build-merger <android-build-merger@google.com> 1499380921 +0000

Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a am: e716af709d" into oc-dev-plus-aosp
am: 58be397044

Change-Id: I2548a98a2cb708bed6d755f0bf486e76be8429c1