tree fb51844e6d8e53dcdfc920e6684092f87b14ef11
parent 684f1cf41bd48cadc94dc5f3f20d6fdadd5c1640
parent 3a6928aa5628e88304283f2e361d74f3edba8015
author Eric Fischer <enf@google.com> 1301944987 -0700
committer Eric Fischer <enf@google.com> 1301944987 -0700

resolved conflicts for merge of 3a6928aa to gingerbread-plus-aosp

Change-Id: I1e3160ce9f3eee1c843358e89fb0950e9d51e59f