OSDN Git Service

am 82a74bbe: (-s ours) am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the...
authorXavier Ducrohet <xav@android.com>
Tue, 7 Feb 2012 00:48:55 +0000 (16:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Feb 2012 00:48:55 +0000 (16:48 -0800)
* commit '82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':


Trivial merge