tree 98a44d75a79943b499210c32ab39200da6f182b4
parent 2a3a2167b77729adc171cb04df00fb5947f0d7f4
parent 4abb8c027976115afd6b38615412e185fa7eec7a
author Chris Banes <chrisbanes@google.com> 1461853025 +0000
committer android-build-merger <android-build-merger@google.com> 1461853025 +0000

Merge "resolve merge conflicts of 19ec6b7 to nyc-dev" into nyc-dev
am: 4abb8c0

* commit '4abb8c027976115afd6b38615412e185fa7eec7a':
  Allow back presses to work in FragmentActivity

Change-Id: Ia55c3a32dcf67adbce0753fe3757d77768795bc3