tree 386ce7a447b9fc07410bb7d7bd29b47b70594352
parent 0b155be05dc021ca1b63bf9b5a032b60ec4871dd
parent 03698e6852ead5f9337fee268bd32f02ef51216f
author Jean-Baptiste Queru <jbq@google.com> 1339440904 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339440904 -0700

am 03698e68: Merge "Change the test case about SCREENLAYOUT_LONG  depending whether the navigation bar is displayed or not."

* commit '03698e6852ead5f9337fee268bd32f02ef51216f':
  Change the test case about SCREENLAYOUT_LONG  depending whether the navigation bar is displayed or not.