tree a98a6d0d28c917b54fb9fc72f203c17497e1ece3
parent 22571e18570c01310372261ce5f3dbc7bd3f5616
parent 884738e4a67d1eccb1d8225239a3e836a84f444c
author Ying Wang <wangying@google.com> 1431111081 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431111082 +0000

Merge "Revert "Fix and cleanup."" into mnc-dev