OSDN Git Service

Merge changes Id7ae3838,I8e297443
authorGeorge Mount <mount@google.com>
Tue, 17 Jun 2014 20:46:33 +0000 (20:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 Jun 2014 05:00:50 +0000 (05:00 +0000)
commitb96075232821552961fde3a83ee984af0ae7f7b2
tree7e9d9e0a468770a3ba4a0fdea6da9c3f8eb28453
parentafc00e1c81a2ae00dc01bb980bc617f382441102
parent4d994261e94b8d7fd2bb383a1d41b5997fab970b
Merge changes Id7ae3838,I8e297443

* changes:
  Fix NPE when shared elements are empty.
  Allow antroid.transition Transitions in fragments.