tree 9cbb0a72c21951f5fbe0f7e05b6f81ba18e8433c
parent b490d5d3ece9b0617feacd71e4b2a85a0e1b26a8
parent 9017e0613271d35dc4ea1a011268e1cf0165c907
author Stuart Scott <stuartscott@google.com> 1415070941 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415070941 +0000

am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89

* commit '9017e0613271d35dc4ea1a011268e1cf0165c907':
  Clean up public API of SubInfoRecord.