tree 6746ceaa1a4d7f0b9c423112fe422705d3e80eab
parent e21baff2d9ae21ec0299f07527f2f97ae184c5e5
parent 1658226ad6c8ec5c5956e9a627a971bc61af944e
author Zheng Fu <zhengfu@google.com> 1407461261 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407461261 +0000

am 1658226a: am 44397930: am 3524769c: Merge "Change the column number from 2 to 3 in Portrait favorites on Volantis" into lmp-dev

* commit '1658226ad6c8ec5c5956e9a627a971bc61af944e':
  Change the column number from 2 to 3 in Portrait favorites on Volantis