tree 37a8404b564737b82753e7ad22fe1614b6d6c3d7
parent 579d8598b2bac75728ed57099e767c8a6d46d7f3
parent 3b7d0066bb89db7f665f58fa1499848c65fd8f51
author Dianne Hackborn <hackbod@google.com> 1287718046 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287718046 -0700

am 101f14b2: (-s ours) am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE" into gingerbread

Merge commit '101f14b275ab2451aef50dec427376d721d17aea'

* commit '101f14b275ab2451aef50dec427376d721d17aea':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE