tree 396991bff7790f29343fae99bd638e34b533b6c4
parent 45639236acfb35e71bb919191274d870f14a808e
parent 47fa62c6374888828d96264221a918ee6d5c6118
author Elliott Hughes <enh@google.com> 1481328784 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1481328785 +0000

Merge changes from topic 'fsconfig-2'

* changes:
  fs_config: add comment to header
  android_ids: move to bionic