tree 3211795dc1ff5480086355adaeb14b98296afae0
parent 2264bd23a69874ac4f2de125c25b46485c5a544e
parent fcf3d207c51f1e734137a08ae2fdb1bb37a50b87
author Nick Kralevich <nnk@google.com> 1388775842 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388775842 -0800

am fcf3d207: Merge "adb: configure /system file permission with fs_config"

* commit 'fcf3d207c51f1e734137a08ae2fdb1bb37a50b87':
  adb: configure /system file permission with fs_config