tree 7f123acefa540f7d07ead345f12a99eb1effb83b
parent 2887ab97d18caa04a009fb255007dc09559957a9
parent 1b30f79cffbe9e0c2b974fa3ee48001edcdd6c05
author Xiyuan Xia <xiyuan@google.com> 1452879092 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1452879092 +0000

Merge "Refactoring for better extendability"