tree ef5ff7e4b24d7c656755bb4b201219dbfe0f3f19
parent 242b747836fc62853081bd8d21cf91b78d1c10b0
parent d22e68389663fc1cce653345d24e2bf5723f4e4b
author Jordan Liu <jminjie@google.com> 1539932202 -0700
committer android-build-merger <android-build-merger@google.com> 1539932202 -0700

[automerger skipped] Merge "Store config file with gid1" am: e4dfd0c327 am: 4026e0806b  -s ours
am: d22e683896  -s ours

Change-Id: I84c10d2bee8783edee1f5eac3d5c6388fcddf9bd