tree caf6f305e1b38920515022fef687c1cee9940023
parent 0cf5336622366a85d11c305774c3146023fda5cd
parent 54f9bd922ac5d4fcfaa34e5878d6de264a565fde
author Lorenzo Colitti <lorenzo@google.com> 1445927577 +0000
committer android-build-merger <android-build-merger@google.com> 1445927577 +0000

Merge "Add some Android-specific kernel options."
am: 54f9bd922a

* commit '54f9bd922ac5d4fcfaa34e5878d6de264a565fde':
  Add some Android-specific kernel options.