tree 15e9bbe75df8f750d57a36bc0004474d8472c837
parent 622b16aed3236a6d74596916026d305215bc7140
parent 2dbf679cf080df06e5340ea4bb766ea4f1aa1956
author Steve McKay <smckay@google.com> 1452538915 +0000
committer android-build-merger <android-build-merger@google.com> 1452538915 +0000

am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':