From: Bill Gruber <billg@google.com>
Date: Thu, 1 Dec 2011 20:41:54 +0000 (-0800)
Subject: am 92a2f5fd: am 715a3c52: am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849c... 
X-Git-Tag: android-x86-4.4-r1~1471^2~407
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=107618b836765391c722169ba25b57505be3ecc7;p=android-x86%2Fframeworks-native.git

am 92a2f5fd: am 715a3c52: am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0

* commit '92a2f5fd6a8e423d6c9ef5b42c576a2ce7e900a2':
  Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
---

107618b836765391c722169ba25b57505be3ecc7