| commit | 539f8de77781f3fdf0e81adb15b1b4718911c500 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 28 14:20:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 28 14:20:28 2016 +0000 |
| tree | 98a44d75a79943b499210c32ab39200da6f182b4 | |
| parent | d844ff821dff3abb5ffc485da336a3e504333c4e [diff] | |
| parent | e3d8737d9156389cbc9d84b60a21650fa0078d64 [diff] |
Merge "resolve merge conflicts of 19ec6b7 to nyc-dev" into nyc-dev am: 4abb8c0 am: e3d8737 * commit 'e3d8737d9156389cbc9d84b60a21650fa0078d64': Allow back presses to work in FragmentActivity Change-Id: I9d8f9e7a2f3ff5b882a83e368151cd777c9c3c5b