tree fe56004dfaa851d98f8233ae0bb64cb85fc10726
parent b14bc39b36d4d4901b229577f5f312549bb2e953
parent e494c513f919b405f92d3a3ebefa105a2482ec5b
author Elliott Hughes <enh@google.com> 1416942205 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416942205 +0000

am e494c513: Merge "Lose sync to toybox."

* commit 'e494c513f919b405f92d3a3ebefa105a2482ec5b':
  Lose sync to toybox.