tree 73164f436b6f6e7966a7ccc9b617e4b14bb294ce
parent 14e1f523c673315cbc3167448ce9252b455d252c
parent 2652b618a86c28fe1914c52dd6a91139c3d9b1e7
author Xavier Ducrohet <xav@android.com> 1300213756 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300213756 -0700

Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread