tree c4c376a4f9559b1da9c1e38e931d7c9e496afea5
parent 314f2f7751809c836517eb57c00e4f71f256e0be
parent 91b2ca8562763c981c4ce93148db80adb51d0cb6
author Andy McFadden <fadden@android.com> 1403101346 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1403038527 +0000

Merge "Add two new display info fields"