am 5eb02aa7: am 912e0eab: Fix for b/16400888 - API Review: GridLayout attributes

* commit '5eb02aa7e9517c8066d1089af6eb571f1ba9ff72':
  Fix for b/16400888 - API Review: GridLayout attributes