tree 1dfbf4cd426266469ede8f741bd12d8601de06bf
parent 94bb600f522e3a6599c66a86aa66f4aba9d41796
parent 3ef7592761cacc3ac5f77576904b3bfb30e066ab
author Scott Main <smain@google.com> 1349237072 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349237072 -0700

am 3ef75927: am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs

* commit '3ef7592761cacc3ac5f77576904b3bfb30e066ab':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs