tree d924a9451f3be63d2b8bd5012933b4fef4419f36
parent 00dcbf8f58c36e3e8803336aa947a333411f43d0
parent fd7adedebf88427162a3ce27fcc9cfd3893c869d
author Dianne Hackborn <hackbod@google.com> 1358980991 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1358980991 +0000

Merge "Add new disabled state for "optional" built-in apps."