commit | 0e161deacc2a99910f36bdcabcb5c449e544466d | [log] [tgz] |
---|---|---|
author | George Mount <mount@google.com> | Tue May 13 15:19:14 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:19:14 2014 +0000 |
tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
parent | d45cc6b4e9b882b593f46af6cbb7bcd8b64af4a4 [diff] | |
parent | ccbda3b2fb06893d0ad8af67a78649f2697b283f [diff] |
am ccbda3b2: am ee6eedec: Merge "Undo inadvertent change to Transitions API demo." * commit 'ccbda3b2fb06893d0ad8af67a78649f2697b283f':