tree adbe72121c056650e0c957c929733b2f7fcf9e05
parent ad6f6e28e0cd38c0f8db870511fb8bbaf4bc710f
parent 4538f01647fa207b41fb7e481cc180e67fd391de
author Sailesh Nepal <sail@google.com> 1397587483 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1397587483 +0000

Merge "Use ComponentName.flattenToShortString" into master-nova