| commit | 3a544a81b3d2d529b2995f4b5db2077760d440b5 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Aug 06 15:00:14 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Wed Aug 06 15:00:14 2014 -0700 |
| tree | daa0050d5d06ebaef98aafc265738a731b6a54fb | |
| parent | 87234e8544370d86b305fc55d6a5021c38b65495 [diff] | |
| parent | a232a68d4ccf2960350adff6af99a52bde2b021d [diff] |
resolved conflicts for merge of a232a68d to jb-mr1.1-docs Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c