commit | 7a870362a04ad9d8a5a140c2691c8cb0a2deb268 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Thu May 30 15:43:07 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 30 15:43:07 2013 -0700 |
tree | 42424368ecf216be521006f00cbe087b37c3fb28 | |
parent | 6796c39d046fb4f831c380ac0190155b08f7e9fd [diff] | |
parent | 92ffcc4d83077833cbe70e35498362e9d43968c2 [diff] |
am 92ffcc4d: Merge "Update copyright/license templates." into jb-mr2-dev-plus-aosp * commit '92ffcc4d83077833cbe70e35498362e9d43968c2': Update copyright/license templates.