aboutsummaryrefslogtreecommitdiffstats
path: root/docs/MergeFunctions.rst
Commit message (Collapse)AuthorAgeFilesLines
* Update aosp/master llvm for rebase to r233350Pirama Arumuga Nainar2015-04-091-3/+3
| | | | Change-Id: I07d935f8793ee8ec6b7da003f6483046594bca49
* Update aosp/master LLVM for rebase to r230699.Stephen Hines2015-03-231-0/+802
Change-Id: I2b5be30509658cb8266be782de0ab24f9099f9b9