tree ba24fe1845559ba629832dc38787ed98f5b3a415
parent e908247b35c8136977bc9968afd54052cfdbb26e
parent 9e79c9d279391b5422544babf695f7381611b1d8
author Android Build Merger (Role) <android-build-merger@google.com> 1461883409 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461883409 +0000

Merge "Fix portrait-orientation assumptions am: 3855bb499f am: dbe726e318" into nyc-mr1-dev-plus-aosp