tree cddb0deee601c8294fdaba681a982b51fc7e5962
parent b90a8813bdba1875545c42f63e3873d54158a121
parent 85ee65483d877e66c4446fce31520f293f0d67c9
author Chong Zhang <chz@google.com> 1443825404 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1443825404 +0000

Merge "Put ResovlerActivity and noDisplay activities in the source task"