tree ed3f372cfb1e3af8765d607123aee098bddda64d
parent 417834b17ee00a6b1cd4e816f632c3596f3f51c3
parent df92635a57e8093d9cbffc38bbf513f3361ee91e
author Elliott Hughes <enh@google.com> 1350943718 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350943718 -0700

am df92635a: Merge "Support zone.tab in bionic, and remove the file format version."

* commit 'df92635a57e8093d9cbffc38bbf513f3361ee91e':
  Support zone.tab in bionic, and remove the file format version.