Android R Beta 3
Merge "Remove no-op references to obsolete variables."