OSDN Git Service

am adc2e32e: am b524167d: am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge...
authorSenpo Hu <senpo@google.com>
Fri, 19 Sep 2014 06:17:44 +0000 (06:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 06:17:44 +0000 (06:17 +0000)
commit279c355682c0a5eecf8c6ad4aa1c80c69a1892b6
tree3bcb3f12b6d50d716e75ef688104c3cace664e77
parent61646c9aaf2b0dafb0ecdc8081234f9a729ab3e3
parentadc2e32e60a3e33c8bfbd2463b8b01a83bed8c6e
am adc2e32e: am b524167d: am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier

* commit 'adc2e32e60a3e33c8bfbd2463b8b01a83bed8c6e':