tree 58145cb07391258aad7238734d4d13b87ce413d4
parent 51c6ad178e723a4cd59a143dd48d81ccdce2d489
parent af59eec776860514a70443dd94a1bcd130ed0ced
author Tom Cherry <tomcherry@google.com> 1428960696 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428960696 +0000

am af59eec7: am e83d8a69: Merge "Fix memory leak in parse_action"

* commit 'af59eec776860514a70443dd94a1bcd130ed0ced':
  Fix memory leak in parse_action