tree 6d537ebe505475d801d4b37b2cc4cde98984ce49
parent a8cf5453719e14dff732b34d2bc7af18ab349353
parent f1743ea0000ef8340c61a7a41bdd0829b8359dfc
author Manu Cornet <manucornet@google.com> 1478910380 +0000
committer android-build-merger <android-build-merger@google.com> 1478910380 +0000

Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am: 954347fb1b
am: f1743ea000  -s ours

Change-Id: Ie91c89b8d71e7e6981502f5079d113ead77b0640