tree 9bac49d2ff8d113a563f2035514a58d7a5ffc6b6
parent 08c2ee3eb6e27b9de064964252e915e7fa3d8761
parent e8e74e50756e9e14cbce0fd8843818a4a196a735
author Jin Cao <jinyan@google.com> 1414958084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414958084 +0000

am e8e74e50: am a96723cb: am e5d819c0: am ba5406e0: Merge "Fix ad mode for two pane layout" into ub-gmail-ur14-dev

* commit 'e8e74e50756e9e14cbce0fd8843818a4a196a735':
  Fix ad mode for two pane layout