tree c80aa63e468f5b8660ed3a3c103ce4046b53f479
parent 52b136783cf7b538aae290b6dc609849f3ad695f
parent 1b744ca49cd61482c9537e08dbd48e60037b2779
author Robert Greenwalt <rgreenwalt@google.com> 1294769721 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1294769721 -0800

Merge "Change local names for greater clarity." into honeycomb