tree 31f6aad308893ead34ce003ef6be66d2a51f0035
parent a2d44ea016ba7c87ae0f581ced483c6963fc920c
parent d1ed82b902f383970810f4445d01f7e2f0ab4358
author Tim Kilbourn <tkilbourn@google.com> 1442598351 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1442598351 +0000

Merge "Remove duplicate initialization from bad merge."