tree 4297bb224b9110dd1d9d930601a144765bf53982
parent 0559e6138f6b08c536cb2925d4f72d594b89f758
parent f0e8daa405f24e23c9cb0254af79d55f5353aaec
author Daniel Sandler <dsandler@android.com> 1316530065 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316530065 -0700

Merge "Fix disappearing nav icons."