tree 0019d5cf61be4527f744e18455ec8b568e3c2a30
parent 3ba6747b3cdb83fc2ae005dd2e309fdc7d3095fb
parent fba1423687f24063e87439b0ae26a12882bb4780
author Scott Main <smain@google.com> 1375394616 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375394616 -0700

am fba14236: am 4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs

* commit 'fba1423687f24063e87439b0ae26a12882bb4780':
  new class on using action bar for training basics