tree 3e7be55a229583c611c887f14225602a1929694e
parent fe4ed6450bf3a1eb119dd864d093765b02565fb3
parent fb177f0083de35ef213bb94b2ad1fca83d716bc5
author Trevor Johns <trevorjohns@google.com> 1374612967 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1374613339 +0000

Merge "Update ActionBarCompat "Basic" sample to use 2-level layout" into jb-mr2-dev